[Orxonox-commit 6910] r11531 - code/branches/SOBv2_HS17/src/modules/superorxobros

[varxth at orxonox.net]

Author: varxth
Date: 2017-11-06 13:38:44 +0100 (Mon, 06 Nov 2017)
New Revision: 11531

Modified:
   code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc
Log:
added orxo_material_gross.png to BlenderFilesSOB

Modified: code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc
===================================================================
--- code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc	2017-11-06 11:58:54 UTC (rev 11530)
+++ code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc	2017-11-06 12:38:44 UTC (rev 11531)
@@ -142,8 +142,8 @@
                 } else{
                     gotPowerUp_ = false;
                     
-                   // TODO: reset to old clothes of figure
-                       // now, change the clothes of the Figure to red
+                   
+            // now, change the clothes of the Figure to old ones
             std::set<WorldEntity*> attachedObjects = this->getAttachedObjects();
             std::set<WorldEntity*>::iterator it;
             for (it = attachedObjects.begin(); it != attachedObjects.end(); ++it)
@@ -151,7 +151,7 @@
                 Model* FiguresModel = orxonox_cast<Model*>(*it);
                 if (FiguresModel != nullptr)
                 {
-                    std::string name = "orxo_material";
+                    std::string name = "orxo_material ";
                     FiguresModel->setMaterial(name);
                 }
             }