[Bf-blender-cvs] [bea4505744f] master: Fix Tests for Weld Modifier with KD-Tree

[Henrik Dick]

Commit: bea4505744f0649925fe8e320cbd1150e1182725
Author: Henrik Dick
Date:   Fri Sep 25 15:17:02 2020 -0300
Branches: master
https://developer.blender.org/rBbea4505744f0649925fe8e320cbd1150e1182725

Fix Tests for Weld Modifier with KD-Tree

Fixes the failing tests and reintroduces the KD-Tree solution.

Reviewed By: mano-wii

Differential Revision: https://developer.blender.org/D9013

===================================================================

M	source/blender/modifiers/intern/MOD_weld.c
M	source/tools
M	tests/python/modifiers.py

===================================================================

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
index ff9928bc44e..2afbb8ec472 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit ff9928bc44e80ec30c78369bf1518599254a0032
+Subproject commit 2afbb8ec472cac5102eb239f57b006f8c9387685
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})]],