Commit a43e7634 authored by Jan Möbius's avatar Jan Möbius

Fixed doxygen headers

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@18168 383ad7c9-94d9-4d36-a494-682f7c89f535
parent f4aee11d
...@@ -1737,7 +1737,7 @@ void Core::deleteObject( int _id ){ ...@@ -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; if ( _objId == -1 ) return;
BaseObject* object = objectRoot_->childExists(_objId); BaseObject* object = objectRoot_->childExists(_objId);
...@@ -1753,7 +1753,7 @@ void Core::deserializeMaterialProperties(int _objId, QString props) { ...@@ -1753,7 +1753,7 @@ void Core::deserializeMaterialProperties(int _objId, QString props) {
return; return;
} }
o->materialNode()->material().deserializeFromJson(props); o->materialNode()->material().deserializeFromJson(_props);
} }
QString Core::serializeMaterialProperties(int _objId) { QString Core::serializeMaterialProperties(int _objId) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment