[Bf-blender-cvs] [97dad8496ca] temp-fracture-modifier-2.8: fix for fastbisect with orthogonal cuts, also fix for crash in FM free function
Martin Felke
noreply at git.blender.org
Wed Aug 15 23:32:11 CEST 2018
Commit: 97dad8496ca11d5847aeede4a18c5378489b9ccc
Author: Martin Felke
Date: Wed Aug 15 23:31:57 2018 +0200
Branches: temp-fracture-modifier-2.8
https://developer.blender.org/rB97dad8496ca11d5847aeede4a18c5378489b9ccc
fix for fastbisect with orthogonal cuts, also fix for crash in FM free function
===================================================================
M source/blender/blenkernel/intern/fracture.c
===================================================================
diff --git a/source/blender/blenkernel/intern/fracture.c b/source/blender/blenkernel/intern/fracture.c
index 29c2f44f9d0..0bc4204cf88 100644
--- a/source/blender/blenkernel/intern/fracture.c
+++ b/source/blender/blenkernel/intern/fracture.c
@@ -298,6 +298,7 @@ static void calculate_fast_bisect(FractureModifierData *fmd, Mesh* me, BisectCon
}
copy_v3_v3(ctx->normal, vec);
+ BKE_fracture_mesh_center_centroid_area(me, ctx->centroid);
}
static void calculate_fractal(FractureModifierData* fmd, Mesh* me, BooleanContext *ctx)
@@ -1902,7 +1903,6 @@ void BKE_fracture_dynamic_free(FractureModifierData *fmd, Scene *scene)
/* in dynamic mode we have to get rid of the entire Meshisland sequence */
/* either at manual refresh or when removing the modifier */
MeshIslandSequence *msq;
- MeshIsland *mi;
while (fmd->shared->meshIsland_sequence.first) {
msq = fmd->shared->meshIsland_sequence.first;
@@ -1915,12 +1915,6 @@ void BKE_fracture_dynamic_free(FractureModifierData *fmd, Scene *scene)
fmd->shared->meshIsland_sequence.first = NULL;
fmd->shared->meshIsland_sequence.last = NULL;
- while (fmd->shared->mesh_islands.first) {
- mi = fmd->shared->mesh_islands.first;
- BLI_remlink(&fmd->shared->mesh_islands, mi);
- BKE_fracture_mesh_island_free(mi, scene);
- }
-
fmd->shared->mesh_islands.first = NULL;
fmd->shared->mesh_islands.last = NULL;
More information about the Bf-blender-cvs
mailing list