From 8335c26119bf5ba78b2afa4e2f65bb3d04b42abe Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Mon, 12 Oct 2020 20:01:42 -0300 Subject: [PATCH] Fix T81467: Crash with KD-Tree Weld Modifier The problem is related to the `use_index_order` option of `BLI_kdtree_3d_calc_duplicates_fast`. With this option, the higher index is expected to be less than `tree->nodes_len`. --- source/blender/modifiers/intern/MOD_weld.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/modifiers/intern/MOD_weld.c b/source/blender/modifiers/intern/MOD_weld.c index 306e093919a..1a25c24fedc 100644 --- a/source/blender/modifiers/intern/MOD_weld.c +++ b/source/blender/modifiers/intern/MOD_weld.c @@ -1687,9 +1687,9 @@ static Mesh *weldModifier_doWeld(WeldModifierData *wmd, const ModifierEvalContex } #else { - KDTree_3d *tree = BLI_kdtree_3d_new(totvert); + KDTree_3d *tree = BLI_kdtree_3d_new(v_mask ? v_mask_act : totvert); for (uint i = 0; i < totvert; i++) { - if (!(v_mask && !BLI_BITMAP_TEST(v_mask, i))) { + if (!v_mask || BLI_BITMAP_TEST(v_mask, i)) { BLI_kdtree_3d_insert(tree, i, mvert[i].co); } vert_dest_map[i] = OUT_OF_CONTEXT; @@ -1697,7 +1697,7 @@ static Mesh *weldModifier_doWeld(WeldModifierData *wmd, const ModifierEvalContex BLI_kdtree_3d_balance(tree); vert_kill_len = BLI_kdtree_3d_calc_duplicates_fast( - tree, wmd->merge_dist, true, (int *)vert_dest_map); + tree, wmd->merge_dist, false, (int *)vert_dest_map); BLI_kdtree_3d_free(tree); } #endif