diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-19 16:46:33 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-19 16:48:51 +0300 |
commit | 109cbdf2e1b609e93270100239906a8e17c64ab5 (patch) | |
tree | 821504319da91e5a5dea1ebaf64978560468288e /source/blender/bmesh | |
parent | e8777a729013d04dcb854b0b9f327e9b90191747 (diff) |
Cleanup: use BLI_kdtree_3d prefix
Use prefix now there isn't only the 3d version.
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/operators/bmo_removedoubles.c | 10 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_decimate_collapse.c | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index 1432e15185e..eba8c37f1e0 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -634,9 +634,9 @@ static void bmesh_find_doubles_common( int *duplicates = MEM_mallocN(sizeof(int) * verts_len, __func__); { - KDTree *tree = BLI_kdtree_new(verts_len); + KDTree_3d *tree = BLI_kdtree_3d_new(verts_len); for (int i = 0; i < verts_len; i++) { - BLI_kdtree_insert(tree, i, verts[i]->co); + BLI_kdtree_3d_insert(tree, i, verts[i]->co); if (has_keep_vert && BMO_vert_flag_test(bm, verts[i], VERT_KEEP)) { duplicates[i] = i; } @@ -645,9 +645,9 @@ static void bmesh_find_doubles_common( } } - BLI_kdtree_balance(tree); - found_duplicates = BLI_kdtree_calc_duplicates_fast(tree, dist, false, duplicates) != 0; - BLI_kdtree_free(tree); + BLI_kdtree_3d_balance(tree); + found_duplicates = BLI_kdtree_3d_calc_duplicates_fast(tree, dist, false, duplicates) != 0; + BLI_kdtree_3d_free(tree); } if (found_duplicates) { diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index 7f6bcf12f84..e5dd6491076 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -424,9 +424,9 @@ static int *bm_edge_symmetry_map(BMesh *bm, uint symmetry_axis, float limit) uint i; int *edge_symmetry_map; const float limit_sq = SQUARE(limit); - KDTree *tree; + KDTree_3d *tree; - tree = BLI_kdtree_new(bm->totedge); + tree = BLI_kdtree_3d_new(bm->totedge); etable = MEM_mallocN(sizeof(*etable) * bm->totedge, __func__); edge_symmetry_map = MEM_mallocN(sizeof(*edge_symmetry_map) * bm->totedge, __func__); @@ -434,12 +434,12 @@ static int *bm_edge_symmetry_map(BMesh *bm, uint symmetry_axis, float limit) BM_ITER_MESH_INDEX (e, &iter, bm, BM_EDGES_OF_MESH, i) { float co[3]; mid_v3_v3v3(co, e->v1->co, e->v2->co); - BLI_kdtree_insert(tree, i, co); + BLI_kdtree_3d_insert(tree, i, co); etable[i] = e; edge_symmetry_map[i] = -1; } - BLI_kdtree_balance(tree); + BLI_kdtree_3d_balance(tree); sym_data.etable = etable; sym_data.limit_sq = limit_sq; @@ -457,7 +457,7 @@ static int *bm_edge_symmetry_map(BMesh *bm, uint symmetry_axis, float limit) sub_v3_v3v3(sym_data.e_dir, sym_data.e_v2_co, sym_data.e_v1_co); sym_data.e_found_index = -1; - BLI_kdtree_range_search_cb(tree, co, limit, bm_edge_symmetry_check_cb, &sym_data); + BLI_kdtree_3d_range_search_cb(tree, co, limit, bm_edge_symmetry_check_cb, &sym_data); if (sym_data.e_found_index != -1) { const int i_other = sym_data.e_found_index; @@ -468,7 +468,7 @@ static int *bm_edge_symmetry_map(BMesh *bm, uint symmetry_axis, float limit) } MEM_freeN(etable); - BLI_kdtree_free(tree); + BLI_kdtree_3d_free(tree); return edge_symmetry_map; } |