summaryrefslogtreecommitdiff
path: root/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp')
-rw-r--r--src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp b/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp
index fef95f0c4..e7af332eb 100644
--- a/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp
+++ b/src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp
@@ -137,7 +137,14 @@ void btMultiBodyDynamicsWorld::updateActivationState(btScalar timeStep)
btMultiBodyLinkCollider* col = body->getBaseCollider();
if (col && col->getActivationState() == ACTIVE_TAG)
{
- col->setActivationState(WANTS_DEACTIVATION);
+ if (body->hasFixedBase())
+ {
+ col->setActivationState(FIXED_BASE_MULTI_BODY);
+ } else
+ {
+ col->setActivationState(WANTS_DEACTIVATION);
+ }
+
col->setDeactivationTime(0.f);
}
for (int b = 0; b < body->getNumLinks(); b++)