Scarfski/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3.git synced 2026-09-22 18:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:erwincoumans/bullet3

Browse Source
This commit is contained in:
Erwin Coumans
2021-04-22 20:41:45 -07:00
parent 83a5fe2d31 6cb72b5128
commit fc2992b75a
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp
View File

@@ -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(ISLAND_SLEEPING);
} else
{
col->setActivationState(WANTS_DEACTIVATION);
}
col->setDeactivationTime(0.f);
}
for (int b = 0; b < body->getNumLinks(); b++)