diff options
| -rw-r--r-- | source/blender/modifiers/intern/MOD_weld.c | 4 | ||||
| m--------- | source/tools | 0 | ||||
| -rw-r--r-- | tests/python/modifiers.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_weld.c b/source/blender/modifiers/intern/MOD_weld.c index 16f1dcec907..46e4f147e20 100644 --- a/source/blender/modifiers/intern/MOD_weld.c +++ b/source/blender/modifiers/intern/MOD_weld.c @@ -29,7 +29,7 @@ //#define USE_WELD_DEBUG //#define USE_WELD_NORMALS -#define USE_BVHTREEKDOP +//#define USE_BVHTREEKDOP #include "MEM_guardedalloc.h" @@ -1696,7 +1696,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, false, (int *)vert_dest_map); + tree, wmd->merge_dist, true, (int *)vert_dest_map); BLI_kdtree_3d_free(tree); } #endif diff --git a/source/tools b/source/tools -Subproject ff9928bc44e80ec30c78369bf1518599254a003 +Subproject 2afbb8ec472cac5102eb239f57b006f8c938768 diff --git a/tests/python/modifiers.py b/tests/python/modifiers.py index 4bbcf226aba..ba156cef8ea 100644 --- a/tests/python/modifiers.py +++ b/tests/python/modifiers.py @@ -186,7 +186,7 @@ def main(): ["testMergedWeld", "expectedMergedWeld", [ModifierSpec("weld", 'WELD', {"merge_threshold": 0.021})]], ["testMergedAllWeld", "expectedMergedAllWeld", - [ModifierSpec("weld", 'WELD', {"merge_threshold": 1.1})]], + [ModifierSpec("weld", 'WELD', {"merge_threshold": 1.8})]], ["testMergedNoneWeld", "expectedMergedNoneWeld", [ModifierSpec("weld", 'WELD', {"merge_threshold": 0.019})]], |