Changeset 8554 for code/branches/pickup/src/orxonox/worldentities/WorldEntity.cc

Timestamp:

May 23, 2011, 11:26:08 PM (13 years ago)

Author:

dafrick

Message:

Some cleanup. Ready for merge.

File:

• code/branches/pickup/src/orxonox/worldentities/WorldEntity.cc (modified) (1 diff)

code/branches/pickup/src/orxonox/worldentities/WorldEntity.cc

@@ -643 +643 @@
     {
         // If physics is enabled scale the attached CollisionShape.
-        if (false && this->hasPhysics() && this->collisionShape_ != NULL)
+        /*if (this->hasPhysics() && this->collisionShape_ != NULL)
         {
             this->collisionShape_->setScale3D(scale);
-        }
+        }*/
 
         this->node_->setScale(scale);