Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Dick <weasel>2020-09-25 21:17:02 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2020-09-25 21:17:02 +0300
commitbea4505744f0649925fe8e320cbd1150e1182725 (patch)
treeda541b792c4df9413d52e9dd8d43f4cc6c2c4aa4 /source/blender/modifiers/intern/MOD_weld.c
parent1f6a1cee74dfc7289a4eba500f3990ea922076df (diff)
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
Diffstat (limited to 'source/blender/modifiers/intern/MOD_weld.c')
-rw-r--r--source/blender/modifiers/intern/MOD_weld.c4
1 files changed, 2 insertions, 2 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