diff options
| author | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-08-08 22:54:08 +0300 |
|---|---|---|
| committer | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-08-09 20:17:24 +0300 |
| commit | 65c320751714a6d4835c0256f6cadcdc60d095db (patch) | |
| tree | 2dc6bdca5edf7d01646d6b81d11bca0a9136a419 /source/gameengine/Physics | |
| parent | 49f3998a0f6892e65d473a24712ecff1637d8c33 (diff) | |
BGE: Fix T44782 suspend/restore dynamics on inactive object.
Diffstat (limited to 'source/gameengine/Physics')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index 8ecb586f77e..a4858046c2a 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -1080,7 +1080,7 @@ void CcdPhysicsController::RefreshCollisions() void CcdPhysicsController::SuspendDynamics(bool ghost) { btRigidBody *body = GetRigidBody(); - if (body && !m_suspended && !GetConstructionInfo().m_bSensor) + if (body && !m_suspended && !GetConstructionInfo().m_bSensor && GetPhysicsEnvironment()->IsActiveCcdPhysicsController(this)) { btBroadphaseProxy* handle = body->getBroadphaseHandle(); @@ -1102,7 +1102,7 @@ void CcdPhysicsController::SuspendDynamics(bool ghost) void CcdPhysicsController::RestoreDynamics() { btRigidBody *body = GetRigidBody(); - if (body && m_suspended) + if (body && m_suspended && GetPhysicsEnvironment()->IsActiveCcdPhysicsController(this)) { // before make sure any position change that was done in this logic frame are accounted for SetTransform(); |