[Orxonox-commit 6914] r11535 - in code/branches/SOBv2_HS17: data/levels src/modules/superorxobros

[varxth at orxonox.net]

Author: varxth
Date: 2017-11-06 15:00:59 +0100 (Mon, 06 Nov 2017)
New Revision: 11535

Modified:
   code/branches/SOBv2_HS17/data/levels/SOB.oxw
   code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc
Log:
THEOt

Modified: code/branches/SOBv2_HS17/data/levels/SOB.oxw
===================================================================
--- code/branches/SOBv2_HS17/data/levels/SOB.oxw	2017-11-06 13:51:31 UTC (rev 11534)
+++ code/branches/SOBv2_HS17/data/levels/SOB.oxw	2017-11-06 14:00:59 UTC (rev 11535)
@@ -13,7 +13,9 @@
 	include("overlays/SOBHUD.oxo")
 	?>
 
+					<!--THEO-->
 
+
 	<Template name=mushroom defaults=0>
 		<SOBMushroom collisionType="dynamic" speed=30>
 			<attached>

Modified: code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc
===================================================================
--- code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc	2017-11-06 13:51:31 UTC (rev 11534)
+++ code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc	2017-11-06 14:00:59 UTC (rev 11535)
@@ -120,7 +120,9 @@
                 if (FiguresModel != nullptr)
                 {
                     std::string name = "orxo_material_gross";
-                    FiguresModel->setSubMaterial(name, 0);
+
+                    FiguresModel->setSubMaterial(name, 4); // 4 is the body
+
                 }
             }   
         }