[Orxonox-commit 5541] r10204 - code/branches/presentationFS14/src/orxonox/collisionshapes

[landauf at orxonox.net]

Author: landauf
Date: 2015-01-25 23:32:17 +0100 (Sun, 25 Jan 2015)
New Revision: 10204

Modified:
   code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.cc
Log:
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)

Modified: code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.cc
===================================================================
--- code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.cc	2015-01-25 22:15:24 UTC (rev 10203)
+++ code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.cc	2015-01-25 22:32:17 UTC (rev 10204)
@@ -39,8 +39,6 @@
 #include "core/XMLPort.h"
 #include "tools/BulletConversions.h"
 
-#include "collisionshapes/WorldEntityCollisionShape.h"
-
 namespace orxonox
 {
     RegisterClass(CompoundCollisionShape);
@@ -119,11 +117,6 @@
 
             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());
     }
 
     /**