diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-11-21 14:56:02 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-11-21 14:56:02 +0300 |
| commit | 318b98fc9a8fe31a6b71c6e71eb0f486fd59b25a (patch) | |
| tree | 914a6f2ee65b593af1b7e075ddb8cbefdd55c916 /extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp | |
| parent | 057a6e336093c48d92e48ea1f47ea6536be291ef (diff) | |
some fixes, related to object activation in game blender
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp index 9cd2828dcad..13fa0b5baa9 100644 --- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp +++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp @@ -41,9 +41,9 @@ void btCollisionObject::forceActivationState(int newState) m_activationState1 = newState; } -void btCollisionObject::activate() +void btCollisionObject::activate(bool forceActivation) { - if (!(m_collisionFlags & (CF_STATIC_OBJECT|CF_KINEMATIC_OBJECT))) + if (forceActivation || !(m_collisionFlags & (CF_STATIC_OBJECT|CF_KINEMATIC_OBJECT))) { setActivationState(ACTIVE_TAG); m_deactivationTime = 0.f; |