Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T72380: New Weld Modifier is crashing when used after a Vertex Weight Modifier

Browse Source 
It happened when the vertex group was empty.
This commit is contained in:
mano-wii
2019-12-12 08:55:28 -03:00
parent ba5aedea8f
commit 85b7d397f7
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/modifiers/intern/MOD_weld.c
View File

@@ -1645,6 +1645,14 @@ static Mesh *weldModifier_doWeld(WeldModifierData *wmd, const ModifierEvalContex
BVHTree *bvhtree = bvhtree_from_mesh_verts_ex( BVHTree *bvhtree = bvhtree_from_mesh_verts_ex(
&treedata, mvert, totvert, false, v_mask, v_mask_act, wmd->merge_dist, 2, 6, 0, NULL); &treedata, mvert, totvert, false, v_mask, v_mask_act, wmd->merge_dist, 2, 6, 0, NULL);
if (v_mask) {
MEM_freeN(v_mask);
}
if (bvhtree == NULL) {
return result;
}
struct WeldOverlapData data; struct WeldOverlapData data;
data.mvert = mvert; data.mvert = mvert;
data.merge_dist_sq = SQUARE(wmd->merge_dist); data.merge_dist_sq = SQUARE(wmd->merge_dist);
@@ -1855,9 +1863,6 @@ static Mesh *weldModifier_doWeld(WeldModifierData *wmd, const ModifierEvalContex
weld_mesh_context_free(&weld_mesh); weld_mesh_context_free(&weld_mesh);
} }
if (v_mask) {
MEM_freeN(v_mask);
}
MEM_freeN(overlap); MEM_freeN(overlap);
return result; return result;
} }