diff options
author | Germano <germano.costa@ig.com.br> | 2018-05-03 20:26:39 +0300 |
---|---|---|
committer | Germano <germano.costa@ig.com.br> | 2018-05-03 20:26:39 +0300 |
commit | ac19483e632bd3e2388a6a0de2db753efe33a860 (patch) | |
tree | a7b7433b51a8501875ab142658749b3ded6b224d /source/blender/editors | |
parent | a5d0597b927d90c3621f8a40b0703cc158800fb8 (diff) |
BKE bvhtree: Add `tree_type` parameter to `bvhtree_from_mesh_get`.
This will allow greater control of the bvhtrees that are obtained, and helps identify problems.
It is also an additional step to unify the functions.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/physics/particle_object.c | 4 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_snap_object.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index f4334a2e872..1e204e97499 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_get(&bvhtree, dm, BVHTREE_FROM_FACES); + bvhtree_from_mesh_get(&bvhtree, dm, BVHTREE_FROM_FACES, 2); } else if (dm->getNumEdges(dm) != 0) { medge = dm->getEdgeArray(dm); - bvhtree_from_mesh_get(&bvhtree, dm, BVHTREE_FROM_EDGES); + bvhtree_from_mesh_get(&bvhtree, dm, BVHTREE_FROM_EDGES, 2); } 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 569c662d31c..94c473d6a65 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -444,7 +444,7 @@ static bool raycastDerivedMesh( } if (treedata->tree == NULL) { - bvhtree_from_mesh_looptri(treedata, dm, 0.0f, 4, 6); + bvhtree_from_mesh_get(treedata, dm, BVHTREE_FROM_LOOPTRI, 4); if (treedata->tree == NULL) { return retval; @@ -1687,10 +1687,10 @@ static bool snapDerivedMesh( if (treedata->tree == NULL) { switch (snapdata->snap_to) { case SCE_SNAP_MODE_EDGE: - bvhtree_from_mesh_get(treedata, dm, BVHTREE_FROM_EDGES); + bvhtree_from_mesh_get(treedata, dm, BVHTREE_FROM_EDGES, 2); break; case SCE_SNAP_MODE_VERTEX: - bvhtree_from_mesh_get(treedata, dm, BVHTREE_FROM_VERTS); + bvhtree_from_mesh_get(treedata, dm, BVHTREE_FROM_VERTS, 2); break; } } |