From 522bee3fc838c83b377d0e05fef8299a29ae5a16 Mon Sep 17 00:00:00 2001 From: Germano Date: Tue, 1 May 2018 10:03:28 -0300 Subject: Refactoring: bvhutils: Use a function that gets the bvhtree through an identifier type. Reviewed By: @campbellbarton Differential Revision: https://developer.blender.org/D3192 --- source/blender/editors/physics/particle_object.c | 4 ++-- source/blender/editors/transform/transform_snap_object.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 546fac6b7a3..f4334a2e872 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -692,11 +692,11 @@ static bool remap_hair_emitter(Scene *scene, Object *ob, ParticleSystem *psys, if (dm->getNumTessFaces(dm) != 0) { mface = dm->getTessFaceArray(dm); - bvhtree_from_mesh_faces(&bvhtree, dm, 0.0, 2, 6); + bvhtree_from_mesh_get(&bvhtree, dm, BVHTREE_FROM_FACES); } else if (dm->getNumEdges(dm) != 0) { medge = dm->getEdgeArray(dm); - bvhtree_from_mesh_edges(&bvhtree, dm, 0.0, 2, 6); + bvhtree_from_mesh_get(&bvhtree, dm, BVHTREE_FROM_EDGES); } else { dm->release(dm); diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index d248d0df4e3..569c662d31c 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -1687,10 +1687,10 @@ static bool snapDerivedMesh( if (treedata->tree == NULL) { switch (snapdata->snap_to) { case SCE_SNAP_MODE_EDGE: - bvhtree_from_mesh_edges(treedata, dm, 0.0f, 2, 6); + bvhtree_from_mesh_get(treedata, dm, BVHTREE_FROM_EDGES); break; case SCE_SNAP_MODE_VERTEX: - bvhtree_from_mesh_verts(treedata, dm, 0.0f, 2, 6); + bvhtree_from_mesh_get(treedata, dm, BVHTREE_FROM_VERTS); break; } } -- cgit v1.2.3