[Orxonox-commit 961] r5684 - code/branches/resource2/src/orxonox/tools

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-08-26 21:31:25 +0200 (Wed, 26 Aug 2009)
New Revision: 5684

Modified:
   code/branches/resource2/src/orxonox/tools/Mesh.cc
Log:
Build fix for Ogre 1.6 Shoggoth.
Everything runs except for the particle scripts where the syntax is mutually exclusive between 1.4 and 1.6
This probably forces us to have two particle scripts folders or some sort of ?\195?\164 preprocessor because 1.6 requires the "particle_system" keyword in front of the script and 1.4 doesn't accept that.

Modified: code/branches/resource2/src/orxonox/tools/Mesh.cc
===================================================================
--- code/branches/resource2/src/orxonox/tools/Mesh.cc	2009-08-26 18:54:17 UTC (rev 5683)
+++ code/branches/resource2/src/orxonox/tools/Mesh.cc	2009-08-26 19:31:25 UTC (rev 5684)
@@ -70,6 +70,7 @@
                 this->entity_ = this->scenemanager_->createEntity("Mesh" + multi_cast<std::string>(Mesh::meshCounter_s++), meshsource);
                 this->entity_->setCastShadows(this->bCastShadows_);
 
+#if OGRE_VERSION < 0x010600
                 this->entity_->setNormaliseNormals(true);
                 /*
                     Excerpt from Ogre forum:
@@ -78,6 +79,7 @@
 
                     I don't know exactly what this means, but I put this here if there will be problems with shaders.
                 */
+#endif
             }
             catch (...)
             {