[Bf-blender-cvs] [9ae68238419] fracture_modifier: disabled "optimization attempt" for automerge again, did not bring much performance and caused visual errors
Martin Felke
noreply at git.blender.org
Sun Jun 11 18:43:46 CEST 2017
Commit: 9ae68238419ea0f3f18028f22293b8a33ff0f7ea
Author: Martin Felke
Date: Sun Jun 11 18:43:36 2017 +0200
Branches: fracture_modifier
https://developer.blender.org/rB9ae68238419ea0f3f18028f22293b8a33ff0f7ea
disabled "optimization attempt" for automerge again, did not bring much performance and caused visual errors
===================================================================
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 c8116d08a15..05a6c09e8c8 100644
--- a/source/blender/modifiers/intern/MOD_fracture.c
+++ b/source/blender/modifiers/intern/MOD_fracture.c
@@ -3270,7 +3270,7 @@ static void prepare_automerge(FractureModifierData *fmd, BMesh *bm)
SharedVert *sv;
SharedVertGroup *vg;
bool do_calc_delta = fmd->keep_distort;
- float margin = 0.01f;
+ float margin = 0.001f;
int cd_edge_crease_offset = CustomData_get_offset(&bm->edata, CD_CREASE);
if (cd_edge_crease_offset == -1) {
@@ -3439,6 +3439,7 @@ static DerivedMesh *do_autoHide(FractureModifierData *fmd, DerivedMesh *dm, Obje
BM_mesh_elem_hflag_disable_all(bm, BM_FACE | BM_EDGE | BM_VERT , BM_ELEM_SELECT, false);
+#if 0
//if (fmd->automerge_dist > 0)
{
Scene* sc = fmd->modifier.scene;
@@ -3457,6 +3458,13 @@ static DerivedMesh *do_autoHide(FractureModifierData *fmd, DerivedMesh *dm, Obje
optimize_automerge(fmd);
}
}
+#endif
+
+ if (fmd->automerge_dist > 0)
+ {
+ //make vert groups together here, if vert is close enough
+ prepare_automerge(fmd, bm);
+ }
if (fmd->face_pairs && fmd->autohide_dist > 0)
{
More information about the Bf-blender-cvs
mailing list