[Orxonox-commit 2309] r7024 - code/branches/presentation3/src/orxonox/graphics

[scheusso at orxonox.net]

Author: scheusso
Date: 2010-05-30 16:46:17 +0200 (Sun, 30 May 2010)
New Revision: 7024

Modified:
   code/branches/presentation3/src/orxonox/graphics/Model.cc
Log:
accidentially disabled lod


Modified: code/branches/presentation3/src/orxonox/graphics/Model.cc
===================================================================
--- code/branches/presentation3/src/orxonox/graphics/Model.cc	2010-05-30 14:36:43 UTC (rev 7023)
+++ code/branches/presentation3/src/orxonox/graphics/Model.cc	2010-05-30 14:46:17 UTC (rev 7024)
@@ -107,9 +107,11 @@
                     Level* level = this->getLevel();
                   
                     assert( level != 0 );
-                    if( level->getLodInfo(this->meshSrc_)!=0 && level->getLodInfo(this->meshSrc_)->getEnabled() )
+                    
+                    if( level->getLodInfo(this->meshSrc_)!=0 )
+                        setLodLevel(level->getLodInfo(this->meshSrc_)->getLodLevel());
+                    if( level->getLodInfo(this->meshSrc_)==0 || level->getLodInfo(this->meshSrc_)->getEnabled() )
                     {
-                        setLodLevel(level->getLodInfo(this->meshSrc_)->getLodLevel());
 
                         float volume = this->mesh_.getEntity()->getBoundingBox().volume();
     //                     float scaleFactor = 1;