Changeset 10072 for code/branches/presentationFS14/src/orxonox/worldentities

Timestamp:

May 22, 2014, 2:35:02 PM (11 years ago)

Author:

smerkli

Message:

Merged turretFS14 branch

Location:

code/branches/presentationFS14

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/WorldEntity.cc (modified) (1 diff)

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

@@ -414 +414 @@
             else if (this->isDynamic())
             {
-                orxout(internal_warning) << "Cannot attach a dynamic object to a WorldEntity." << endl;
-                return false;
+                //***HACKY HACK (to allow turrets to be attached)***
+                //orxout(internal_warning) << "Cannot attach a dynamic object to a WorldEntity." << endl;
+                //return false;
             }
             else if (this->isKinematic() && newParent->isDynamic())