Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Weld Modifier: Reduce size of the leaf nodes to half

Browse Source 
This improves performance by reducing the amount of false positives.

A self overlap is made, so the distance from the vertices in the
overlap nodes is actually added.
This commit is contained in:
mano-wii
2020-01-18 15:28:49 -03:00
parent 5472ae6fdf
commit deb59c25c0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1602,6 +1602,7 @@ static bool bvhtree_weld_overlap_cb(void *userdata, int index_a, int index_b, in
struct WeldOverlapData *data = userdata; struct WeldOverlapData *data = userdata;
const MVert *mvert = data->mvert; const MVert *mvert = data->mvert;
const float dist_sq = len_squared_v3v3(mvert[index_a].co, mvert[index_b].co); const float dist_sq = len_squared_v3v3(mvert[index_a].co, mvert[index_b].co);
BLI_assert(dist_sq <= ((data->merge_dist_sq + FLT_EPSILON) * 3));
return dist_sq <= data->merge_dist_sq; return dist_sq <= data->merge_dist_sq;
} }
return false; return false;
@@ -1646,7 +1647,7 @@ static Mesh *weldModifier_doWeld(WeldModifierData *wmd, const ModifierEvalContex
/* TODO: For a better performanse use KD-Tree. */ /* TODO: For a better performanse use KD-Tree. */
struct BVHTreeFromMesh treedata; struct BVHTreeFromMesh treedata;
BVHTree *bvhtree = bvhtree_from_mesh_verts_ex( BVHTree *bvhtree = bvhtree_from_mesh_verts_ex(
&treedata, mvert, totvert, false, v_mask, v_mask_act, wmd->merge_dist, 2, 6, 0, NULL); &treedata, mvert, totvert, false, v_mask, v_mask_act, wmd->merge_dist / 2, 2, 6, 0, NULL);
if (v_mask) { if (v_mask) {
MEM_freeN(v_mask); MEM_freeN(v_mask);