Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp

Timestamp:

Feb 27, 2011, 7:43:24 AM (14 years ago)

Author:

rgrieder

Message:

Updated Bullet Physics Engine from v2.74 to v2.77

File:

• code/branches/kicklib/src/external/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp (modified) (1 diff)

code/branches/kicklib/src/external/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp

@@ -133 +133 @@
 void    btSimpleDynamicsWorld::removeRigidBody(btRigidBody* body)
 {
-        removeCollisionObject(body);
-}
+        btCollisionWorld::removeCollisionObject(body);
+}
+
+void    btSimpleDynamicsWorld::removeCollisionObject(btCollisionObject* collisionObject)
+{
+        btRigidBody* body = btRigidBody::upcast(collisionObject);
+        if (body)
+                removeRigidBody(body);
+        else
+                btCollisionWorld::removeCollisionObject(collisionObject);
+}
+
 
 void    btSimpleDynamicsWorld::addRigidBody(btRigidBody* body)