[Bf-blender-cvs] [8611d01] fracture_modifier: crash fix in propagateDamage, checking for index being smaller than connection size now

Martin Felke noreply at git.blender.org
Thu Oct 22 19:58:24 CEST 2015


Commit: 8611d01c68eba7ebaa45c58d1df4dcac0f0b5086
Author: Martin Felke
Date:   Thu Oct 22 19:58:08 2015 +0200
Branches: fracture_modifier
https://developer.blender.org/rB8611d01c68eba7ebaa45c58d1df4dcac0f0b5086

crash fix in propagateDamage, checking for index being smaller than connection size now

===================================================================

M	extern/bullet2/src/BulletDynamics/Dynamics/btFractureDynamicsWorld.cpp

===================================================================

diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btFractureDynamicsWorld.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btFractureDynamicsWorld.cpp
index 61c1f3b..8a26ca4 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btFractureDynamicsWorld.cpp
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btFractureDynamicsWorld.cpp
@@ -702,7 +702,7 @@ void	btFractureDynamicsWorld::breakDisconnectedParts( btFractureBody* fracObj)
 void btFractureDynamicsWorld::propagateDamage(btFractureBody *body, btScalar *impulse, int connection_index, bool* needsBreakingCheck)
 {
 	//min break impulse, todo expose
-	if (*impulse > 0.5f)
+	if (*impulse > 0.5f && body->m_connections.size() > connection_index)
 	{
 		btConnection& connection = body->m_connections[connection_index];
 		connection.m_strength -= *impulse;




More information about the Bf-blender-cvs mailing list