diff options
author | Severin <julian_eisel@web.de> | 2014-12-04 22:48:11 +0300 |
---|---|---|
committer | Severin <julian_eisel@web.de> | 2014-12-04 22:48:11 +0300 |
commit | 1254e98a48aa92bbf6e707fbc28f42bee17a264f (patch) | |
tree | 8cd67d04e91e3513bb55e5e93d7f78a30c77ddc4 /source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp | |
parent | 151f2467a4c42d787d6d26869dbe402ccb725679 (diff) | |
parent | 226eb53bc7f6d0aa1769b6c889d3b15d1f4944b5 (diff) |
Merge branch 'master' into imeinput_method_editor
Diffstat (limited to 'source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp')
-rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index e17d4402556..38e7df6c573 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -504,9 +504,9 @@ bool CcdPhysicsEnvironment::RemoveCcdPhysicsController(CcdPhysicsController* ctr btRigidBody* body = ctrl->GetRigidBody(); if (body) { - for (int i=body->getNumConstraintRefs()-1;i>=0;i--) + for (int i = m_dynamicsWorld->getNumConstraints()-1;i>=0;i--) { - btTypedConstraint* con = body->getConstraintRef(i); + btTypedConstraint *con = m_dynamicsWorld->getConstraint(i); m_dynamicsWorld->removeConstraint(con); body->removeConstraintRef(con); //delete con; //might be kept by python KX_ConstraintWrapper |