diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-30 12:12:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 12:12:48 +0200 |
| commit | b8c92828146ba22e2bb205da73aecc0619581829 (patch) | |
| tree | 12e85ed2af037e8518498517cdfb906edbb3efe3 /thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp | |
| parent | 4a9a2315666ecdde98b2e0f61802b005b862203d (diff) | |
| parent | b55fd934ee0e4dfc6dede8bbaadb15bf71eff74e (diff) | |
Merge pull request #48299 from akien-mga/bullet-3.09
Diffstat (limited to 'thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp')
| -rw-r--r-- | thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp b/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp index fef95f0c4e..e7af332eb3 100644 --- a/thirdparty/bullet/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp +++ b/thirdparty/bullet/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++) |