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/BulletDynamics | |
| parent | 057a6e336093c48d92e48ea1f47ea6536be291ef (diff) | |
some fixes, related to object activation in game blender
Diffstat (limited to 'extern/bullet2/src/BulletDynamics')
| -rw-r--r-- | extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp index bdde013aadb..0dece6b20e6 100644 --- a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp +++ b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp @@ -368,8 +368,14 @@ void btDiscreteDynamicsWorld::updateActivationState(float timeStep) if (body->wantsSleeping()) { - if (body->getActivationState() == ACTIVE_TAG) - body->setActivationState( WANTS_DEACTIVATION ); + if (body->isStaticOrKinematicObject()) + { + body->setActivationState(ISLAND_SLEEPING); + } else + { + if (body->getActivationState() == ACTIVE_TAG) + body->setActivationState( WANTS_DEACTIVATION ); + } } else { if (body->getActivationState() != DISABLE_DEACTIVATION) |