Changeset 10204 for code/branches

Timestamp:

Jan 25, 2015, 11:32:17 PM (10 years ago)

Author:

landauf

Message:

i think this can be removed as well. the user pointer was probably only used in the debugging functions in Pawn.cc (which was already removed)

File:

• code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) (2 diffs)

code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.cc

@@ -39 +39 @@
 #include "core/XMLPort.h"
 #include "tools/BulletConversions.h"
-
-#include "collisionshapes/WorldEntityCollisionShape.h"
 
 namespace orxonox
@@ -120 +118 @@
             this->updatePublicShape();
         }
-
-        // If the shape to be attached is not a CompoundCollisionShape (thus an actual physical shape) & this is a WorldEntity's CollisionShape,
-        // set it's userPointer to the WorldEntity this CompoundCollisionShape belongs to.
-        if (!orxonox_cast<CompoundCollisionShape*>(shape) && orxonox_cast<WorldEntityCollisionShape*>(this))
-            shape->getCollisionShape()->setUserPointer(orxonox_cast<WorldEntityCollisionShape*>(this)->getWorldEntityOwner());
     }