diff options
author | Germano <germano.costa@ig.com.br> | 2018-05-04 15:21:42 +0300 |
---|---|---|
committer | Germano <germano.costa@ig.com.br> | 2018-05-04 15:21:42 +0300 |
commit | aea637456e7db640f9a1a83416769245a9b18a7d (patch) | |
tree | 64086269fddaa64032a13fe979a0c13693cd891c /source/blender/blenkernel | |
parent | 3dd6912fce9285c52cdff26739068703ca378a86 (diff) |
BKE: BVHtree: Replace all external references of `bvhtree_from_mesh_looptri` with `bvhtree_from_mesh_get`.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_bvhutils.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/bvhutils.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_remap.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h index b9f07e07f12..57a6c413ce0 100644 --- a/source/blender/blenkernel/BKE_bvhutils.h +++ b/source/blender/blenkernel/BKE_bvhutils.h @@ -148,8 +148,6 @@ BVHTree *bvhtree_from_editmesh_looptri_ex( const BLI_bitmap *mask, int looptri_num_active, float epsilon, int tree_type, int axis, BVHCache **bvhCache); -BVHTree *bvhtree_from_mesh_looptri( - struct BVHTreeFromMesh *data, struct DerivedMesh *mesh, float epsilon, int tree_type, int axis); BVHTree *bvhtree_from_mesh_looptri_ex( struct BVHTreeFromMesh *data, const struct MVert *vert, const bool vert_allocated, diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 416ac3cbaa0..440db911298 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -1127,7 +1127,7 @@ BVHTree *bvhtree_from_editmesh_looptri( * * \note for editmesh this is currently a duplicate of bvhtree_from_mesh_faces */ -BVHTree *bvhtree_from_mesh_looptri( +static BVHTree *bvhtree_from_mesh_looptri( BVHTreeFromMesh *data, DerivedMesh *dm, float epsilon, int tree_type, int axis) { diff --git a/source/blender/blenkernel/intern/mesh_remap.c b/source/blender/blenkernel/intern/mesh_remap.c index cf4c70c4aaa..1b05745550d 100644 --- a/source/blender/blenkernel/intern/mesh_remap.c +++ b/source/blender/blenkernel/intern/mesh_remap.c @@ -1409,7 +1409,7 @@ void BKE_mesh_remap_calc_loops_from_dm( } else { BLI_assert(num_trees == 1); - bvhtree_from_mesh_looptri(&treedata[0], dm_src, 0.0, 2, 6); + bvhtree_from_mesh_get(&treedata[0], dm_src, BVHTREE_FROM_LOOPTRI, 2); } } |