bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix Tests for Weld Modifier with KD-Tree

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

Reviewed By: mano-wii

Differential Revision: https://developer.blender.org/D9013
This commit is contained in:
Henrik Dick 2020-09-25 15:17:02 -03:00 committed by Germano Cavalcante
parent 1f6a1cee74
commit bea4505744
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/modifiers/intern/MOD_weld.c
View File

@ -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

2
source/tools

@ -1 +1 @@
Subproject commit ff9928bc44e80ec30c78369bf1518599254a0032
Subproject commit 2afbb8ec472cac5102eb239f57b006f8c9387685

2
tests/python/modifiers.py
View File

@ -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})]],