[Bf-blender-cvs] [d5a6b3b18c5] master: Weld Modifier: Disable the KD Tree solution

[Germano Cavalcante]

Commit: d5a6b3b18c5d6c751b6b0091453d836313dbcde1
Author: Germano Cavalcante
Date:   Fri Sep 25 09:37:48 2020 -0300
Branches: master
https://developer.blender.org/rBd5a6b3b18c5d6c751b6b0091453d836313dbcde1

Weld Modifier: Disable the KD Tree solution

This solution is causing the modifier regression test to fail.

Also fix a mistake to allocate `vert_dest_map` twice.

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

M	source/blender/modifiers/intern/MOD_weld.c

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

diff --git a/source/blender/modifiers/intern/MOD_weld.c b/source/blender/modifiers/intern/MOD_weld.c
index a902da2496e..d9de6e826a5 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"
 
@@ -1687,7 +1687,6 @@ static Mesh *weldModifier_doWeld(WeldModifierData *wmd, const ModifierEvalContex
   }
 #else
   {
-    vert_dest_map = MEM_malloc_arrayN(totvert, sizeof(*vert_dest_map), __func__);
     KDTree_3d *tree = BLI_kdtree_3d_new(totvert);
     for (i = 0; i < totvert; i++) {
       if (!(v_mask && !BLI_BITMAP_TEST(v_mask, i))) {