[Bf-blender-cvs] [2df9e4909c2] fracture_modifier: reset automerge (distortion, exceeded) in external mode now too on startframe

[Martin Felke]

Commit: 2df9e4909c2f4b763fc09d2f4bf234ff8b4077cb
Author: Martin Felke
Date:   Mon Jun 12 12:16:55 2017 +0200
Branches: fracture_modifier
https://developer.blender.org/rB2df9e4909c2f4b763fc09d2f4bf234ff8b4077cb

reset automerge (distortion, exceeded) in external mode now too on startframe

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

M       source/blender/modifiers/intern/MOD_fracture.c

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

diff --git a/source/blender/modifiers/intern/MOD_fracture.c 
b/source/blender/modifiers/intern/MOD_fracture.c
index 17585ce9fb4..a00340fa774 100644
--- a/source/blender/modifiers/intern/MOD_fracture.c
+++ b/source/blender/modifiers/intern/MOD_fracture.c
@@ -3237,14 +3237,14 @@ static void reset_automerge(FractureModifierData *fmd)
 
        for (vg = fmd->shared_verts.first; vg; vg = vg->next) {
                vg->exceeded = false;
-               vg->moved = false;
+               //vg->moved = false;
                zero_v3(vg->delta);
                vg->deltas_set = false;
 
                for (sv = vg->verts.first; sv; sv = sv->next)
                {
                        sv->exceeded = false;
-                       sv->moved = false;
+                       //sv->moved = false;
                        zero_v3(sv->delta);
                        sv->deltas_set = false;
                }
@@ -4360,6 +4360,19 @@ static void do_island_index_map(FractureModifierData 
*fmd)
        }
 }
 
+static void do_reset_automerge(FractureModifierData* fmd)
+{
+       if (fmd->modifier.scene && fmd->modifier.scene->rigidbody_world) {
+               Scene *sc = fmd->modifier.scene;
+               RigidBodyWorld *rbw = sc->rigidbody_world;
+               int frame = (int)BKE_scene_frame_get(sc);
+               int start = rbw ? MAX2(rbw->pointcache->startframe, sc->r.sfra) 
: 1;
+               if (frame == start) {
+                       reset_automerge(fmd);
+               }
+       }
+}
+
 
 static DerivedMesh *doSimulate(FractureModifierData *fmd, Object *ob, 
DerivedMesh *dm, DerivedMesh *orig_dm, char names [][66], int count)
 {
@@ -4428,21 +4441,13 @@ static DerivedMesh *doSimulate(FractureModifierData 
*fmd, Object *ob, DerivedMes
                }
        }
 
+       do_reset_automerge(fmd);
+
        if (fmd->refresh_constraints) {
                do_island_index_map(fmd);
                do_refresh_constraints(fmd, ob);
        }
 
-       if (fmd->modifier.scene && fmd->modifier.scene->rigidbody_world) {
-               Scene *sc = fmd->modifier.scene;
-               RigidBodyWorld *rbw = sc->rigidbody_world;
-               int frame = (int)BKE_scene_frame_get(sc);
-               int start = rbw ? rbw->pointcache->startframe : 1;
-               if (frame == start) {
-                       reset_automerge(fmd);
-               }
-       }
-
        /*XXX better rename this, it checks whether we have a valid fractured 
mesh */
        exploOK = !fmd->explo_shared || (fmd->explo_shared && fmd->dm && 
fmd->frac_mesh);
 
@@ -5059,6 +5064,8 @@ static DerivedMesh *applyModifier(ModifierData *md, 
Object *ob,
                                }
                        }
 
+                       do_reset_automerge(fmd);
+
                        if (fmd->autohide_dist > 0 || fmd->automerge_dist > 0)
                        {
                                dm_final = do_autoHide(fmd, 
fmd->visible_mesh_cached, ob);

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