[Bf-blender-cvs] [9c74435] fracture_modifier: fix: there was a speed regression when building many constraints during fracture or after loading

[Martin Felke]

Commit: 9c744358a52d34c0635b7c4852c4c5c004c36860
Author: Martin Felke
Date:   Thu Feb 4 23:14:10 2016 +0100
Branches: fracture_modifier
https://developer.blender.org/rB9c744358a52d34c0635b7c4852c4c5c004c36860

fix: there was a speed regression when building many constraints during 
fracture or after loading

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

M       source/blender/blenkernel/intern/rigidbody.c

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

diff --git a/source/blender/blenkernel/intern/rigidbody.c 
b/source/blender/blenkernel/intern/rigidbody.c
index ba6a15d..64f021e 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -4185,7 +4185,7 @@ static bool restoreKinematic(RigidBodyWorld *rbw)
        return did_it;
 }
 
-
+#if 0
 static void resetPrefractured(RigidBodyWorld *rbw)
 {
        GroupObject *go;
@@ -4316,6 +4316,7 @@ static void resetExternal(RigidBodyWorld *rbw)
                }
        }
 }
+#endif
 
 static ThreadMutex reset_lock = BLI_MUTEX_INITIALIZER;
 static void resetDynamic(RigidBodyWorld *rbw, bool do_reset_always)
@@ -4419,7 +4420,7 @@ void BKE_rigidbody_cache_reset(RigidBodyWorld *rbw)
                //restoreKinematic(rbw);
                //if (!(rbw->pointcache->flag & PTCACHE_BAKED))
                resetDynamic(rbw, true);
-               resetPrefractured(rbw);
+               //resetPrefractured(rbw);
        }
 }
 
@@ -4459,7 +4460,7 @@ void BKE_rigidbody_rebuild_world(Scene *scene, float 
ctime)
                        {
                                resetDynamic(rbw, true);
                                //resetExternal(rbw);
-                               resetPrefractured(rbw);
+                               //resetPrefractured(rbw);
                        }
 
                        BKE_ptcache_id_reset(scene, &pid, 
PTCACHE_RESET_OUTDATED);

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