diff options
author | Germano <germano.costa@ig.com.br> | 2018-05-04 15:22:48 +0300 |
---|---|---|
committer | Germano <germano.costa@ig.com.br> | 2018-05-04 15:22:48 +0300 |
commit | 02baf714093e7bfbcd6a72ea8032b2cff74a1f00 (patch) | |
tree | bf511df466a11a64d93d67cd2df6ebe649c7c9a6 /source/blender/makesrna/intern/rna_object_api.c | |
parent | 3f95daa31fa98b1bd67fc71835f0011287c1d136 (diff) | |
parent | aea637456e7db640f9a1a83416769245a9b18a7d (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_object_api.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_object_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 7b04bf80af6..04507d1ed7e 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -311,7 +311,7 @@ static void rna_Object_ray_cast( BVHTreeFromMesh treeData = {NULL}; /* no need to managing allocation or freeing of the BVH data. this is generated and freed as needed */ - bvhtree_from_mesh_looptri(&treeData, ob->derivedFinal, 0.0f, 4, 6); + bvhtree_from_mesh_get(&treeData, ob->derivedFinal, BVHTREE_FROM_LOOPTRI, 4); /* may fail if the mesh has no faces, in that case the ray-cast misses */ if (treeData.tree != NULL) { @@ -360,7 +360,7 @@ static void rna_Object_closest_point_on_mesh( } /* no need to managing allocation or freeing of the BVH data. this is generated and freed as needed */ - bvhtree_from_mesh_looptri(&treeData, ob->derivedFinal, 0.0f, 4, 6); + bvhtree_from_mesh_get(&treeData, ob->derivedFinal, BVHTREE_FROM_LOOPTRI, 4); if (treeData.tree == NULL) { BKE_reportf(reports, RPT_ERROR, "Object '%s' could not create internal data for finding nearest point", |