diff options
author | Germano <germano.costa@ig.com.br> | 2018-05-03 20:33:52 +0300 |
---|---|---|
committer | Germano <germano.costa@ig.com.br> | 2018-05-03 20:33:52 +0300 |
commit | a9d264f5ca1d631e1151bff55fd8cb3c87193bce (patch) | |
tree | 9c70cb490d8056f7f54a117eac4bdcba7a2c3237 /source/blender/blenkernel/BKE_bvhutils.h | |
parent | 20185a8681f15f3e4e129e064fbe9a150dc4c963 (diff) | |
parent | ac19483e632bd3e2388a6a0de2db753efe33a860 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_bvhutils.h')
-rw-r--r-- | source/blender/blenkernel/BKE_bvhutils.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h index 33e88a6b8f8..ab3f9bc1a87 100644 --- a/source/blender/blenkernel/BKE_bvhutils.h +++ b/source/blender/blenkernel/BKE_bvhutils.h @@ -161,7 +161,9 @@ BVHTree *bvhtree_from_mesh_looptri_ex( const BLI_bitmap *mask, int looptri_num_active, float epsilon, int tree_type, int axis); -BVHTree *bvhtree_from_mesh_get(struct BVHTreeFromMesh *data, struct DerivedMesh *mesh, int type); +BVHTree *bvhtree_from_mesh_get( + struct BVHTreeFromMesh *data, struct DerivedMesh *mesh, + const int type, const int tree_type); /** * Frees data allocated by a call to bvhtree_from_mesh_*. |