AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2025-01-09 09:00:08 +00:00
Code Issues Releases Wiki Activity

remove the 'isActive' test when merging simulation islands for constraints and speculative contacts, it is wrong

Browse Source 
This fixes issue 709
This commit is contained in:
erwin.coumans 2013-09-16 17:25:05 +00:00
parent c28652de37
commit 126fd06ac6
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
View File

@ -744,12 +744,7 @@ void btDiscreteDynamicsWorld::calculateSimulationIslands()
if (((colObj0) && (!(colObj0)->isStaticOrKinematicObject())) && if (((colObj0) && (!(colObj0)->isStaticOrKinematicObject())) &&
((colObj1) && (!(colObj1)->isStaticOrKinematicObject()))) ((colObj1) && (!(colObj1)->isStaticOrKinematicObject())))
{ {
if (colObj0->isActive() || colObj1->isActive()) getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(),(colObj1)->getIslandTag());
{
getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(),
(colObj1)->getIslandTag());
}
} }
} }
} }
@ -768,12 +763,7 @@ void btDiscreteDynamicsWorld::calculateSimulationIslands()
if (((colObj0) && (!(colObj0)->isStaticOrKinematicObject())) && if (((colObj0) && (!(colObj0)->isStaticOrKinematicObject())) &&
((colObj1) && (!(colObj1)->isStaticOrKinematicObject()))) ((colObj1) && (!(colObj1)->isStaticOrKinematicObject())))
{ {
if (colObj0->isActive() || colObj1->isActive()) getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(),(colObj1)->getIslandTag());
{
getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(),
(colObj1)->getIslandTag());
}
} }
} }
} }