diff options
author | Germano Cavalcante <germano.costa@ig.com.br> | 2020-09-25 15:37:48 +0300 |
---|---|---|
committer | Germano Cavalcante <germano.costa@ig.com.br> | 2020-09-25 15:37:59 +0300 |
commit | d5a6b3b18c5d6c751b6b0091453d836313dbcde1 (patch) | |
tree | 0b245880cfa0d5bbe8cccc109397e9973e9d74b0 /source/blender/modifiers | |
parent | 64583f3e8d0f337a977c9a90b874bee733a37402 (diff) |
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.
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_weld.c | 3 |
1 files changed, 1 insertions, 2 deletions
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))) { |