diff options
Diffstat (limited to 'source/gameengine/Physics/Bullet/CcdPhysicsController.cpp')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index 6ce52b60426..6be6400e011 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -145,6 +145,8 @@ CcdPhysicsController::CcdPhysicsController (const CcdConstructionInfo& ci) m_bulletMotionState = 0; m_characterController = 0; m_savedCollisionFlags = 0; + m_savedCollisionFilterGroup = 0; + m_savedCollisionFilterMask = 0; m_savedMass = 0.0; m_suspended = false; @@ -1057,8 +1059,12 @@ void CcdPhysicsController::SuspendDynamics(bool ghost) btRigidBody *body = GetRigidBody(); if (body && !m_suspended && !GetConstructionInfo().m_bSensor) { + btBroadphaseProxy* handle = body->getBroadphaseHandle(); + m_savedCollisionFlags = body->getCollisionFlags(); m_savedMass = GetMass(); + m_savedCollisionFilterGroup = handle->m_collisionFilterGroup; + m_savedCollisionFilterMask = handle->m_collisionFilterMask; m_suspended = true; GetPhysicsEnvironment()->UpdateCcdPhysicsController(this, 0.0, @@ -1078,8 +1084,8 @@ void CcdPhysicsController::RestoreDynamics() GetPhysicsEnvironment()->UpdateCcdPhysicsController(this, m_savedMass, m_savedCollisionFlags, - GetConstructionInfo().m_collisionFilterGroup, - GetConstructionInfo().m_collisionFilterMask); + m_savedCollisionFilterGroup, + m_savedCollisionFilterMask); body->activate(); m_suspended = false; } |