From a43e7634b969fb2e642f5b1a9c0642638655a188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Wed, 12 Feb 2014 15:22:11 +0000
Subject: [PATCH] Fixed doxygen headers

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@18168 383ad7c9-94d9-4d36-a494-682f7c89f535
---
 Core/Core.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/Core.cc b/Core/Core.cc
index d9bce0e0..a4d9a603 100644
--- a/Core/Core.cc
+++ b/Core/Core.cc
@@ -1737,7 +1737,7 @@ void Core::deleteObject( int _id ){
 
 }
 
-void Core::deserializeMaterialProperties(int _objId, QString props) {
+void Core::deserializeMaterialProperties(int _objId, QString _props) {
     if ( _objId == -1 ) return;
 
     BaseObject* object = objectRoot_->childExists(_objId);
@@ -1753,7 +1753,7 @@ void Core::deserializeMaterialProperties(int _objId, QString props) {
         return;
     }
 
-    o->materialNode()->material().deserializeFromJson(props);
+    o->materialNode()->material().deserializeFromJson(_props);
 }
 
 QString Core::serializeMaterialProperties(int _objId) {
-- 
GitLab