Revision: 19531
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19531
Author: campbellbarton
Date: 2009-04-04 06:56:05 +0200 (Sat, 04 Apr 2009)
Log Message:
-----------
fix for [#18484] Bullet Crash (possibly because of overlapping rigid body balls)
simple missing negative index check.
Modified Paths:
--------------
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
Modified:
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
===================================================================
---
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
2009-04-04 02:57:35 UTC (rev 19530)
+++
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
2009-04-04 04:56:05 UTC (rev 19531)
@@ -725,9 +725,13 @@
{
if (colObj0->isActive() || colObj1->isActive())
{
-
-
getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(),
- (colObj1)->getIslandTag());
+ if ((colObj0)->getIslandTag() != -1 &&
(colObj1)->getIslandTag() != -1)
+ {
+
+
getSimulationIslandManager()->getUnionFind().unite((colObj0)->getIslandTag(),
+
(colObj1)->getIslandTag());
+ }
+
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
