[Bf-blender-cvs] [e6d181c] fracture_modifier: tiny fixes for autohide and attempt to get rid of propagateDamage crashes (again)

[Martin Felke]

Commit: e6d181c01a0b8665ca86b648dc04910e2a308848
Author: Martin Felke
Date:   Tue Oct 27 13:19:46 2015 +0100
Branches: fracture_modifier
https://developer.blender.org/rBe6d181c01a0b8665ca86b648dc04910e2a308848

tiny fixes for autohide and attempt to get rid of propagateDamage crashes 
(again)

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

M       extern/bullet2/src/BulletDynamics/Dynamics/btFractureDynamicsWorld.cpp
M       source/blender/modifiers/intern/MOD_fracture.c

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

diff --git 
a/extern/bullet2/src/BulletDynamics/Dynamics/btFractureDynamicsWorld.cpp 
b/extern/bullet2/src/BulletDynamics/Dynamics/btFractureDynamicsWorld.cpp
index f20a500..ed914d9 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btFractureDynamicsWorld.cpp
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btFractureDynamicsWorld.cpp
@@ -901,7 +901,7 @@ void 
btFractureDynamicsWorld::propagateDamage(btFractureBody *body, btScalar *im
                {
                        int i, size = adjacents->size();
                        //clamp size... else too much recursion going on, 
leading to crashes
-                       if (size > 1)
+                       if (size > 2)
                        {
                                for (i=0;i<size;i++)
                                {
diff --git a/source/blender/modifiers/intern/MOD_fracture.c 
b/source/blender/modifiers/intern/MOD_fracture.c
index 8d73261..d2541f7 100644
--- a/source/blender/modifiers/intern/MOD_fracture.c
+++ b/source/blender/modifiers/intern/MOD_fracture.c
@@ -3387,7 +3387,7 @@ static DerivedMesh *doSimulate(FractureModifierData *fmd, 
Object *ob, DerivedMes
                }
        }
 
-       if (fmd->refresh_autohide && fmd->autohide_dist > 0) {
+       if (fmd->refresh_autohide) {
                do_refresh_autohide(fmd);
        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs