[Bf-blender-cvs] [16253285ff6] master: BKE: BVHtree: make `bvhtree_from_mesh_edges` a static function.

Germano noreply at git.blender.org
Thu May 3 23:33:27 CEST 2018


Commit: 16253285ff66039b2e861422e96a102e3118205a
Author: Germano
Date:   Thu May 3 18:33:16 2018 -0300
Branches: master
https://developer.blender.org/rB16253285ff66039b2e861422e96a102e3118205a

BKE: BVHtree: make `bvhtree_from_mesh_edges` a static function.

This will help us have more control over bvhtrees that are cached.

===================================================================

M	source/blender/blenkernel/BKE_bvhutils.h
M	source/blender/blenkernel/intern/bvhutils.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h
index ab3f9bc1a87..b9f07e07f12 100644
--- a/source/blender/blenkernel/BKE_bvhutils.h
+++ b/source/blender/blenkernel/BKE_bvhutils.h
@@ -126,9 +126,6 @@ BVHTree *bvhtree_from_editmesh_edges_ex(
         const BLI_bitmap *edges_mask, int edges_num_active,
         float epsilon, int tree_type, int axis);
 
-BVHTree *bvhtree_from_mesh_edges(
-        struct BVHTreeFromMesh *data, struct DerivedMesh *mesh,
-        float epsilon, int tree_type, int axis);
 BVHTree *bvhtree_from_mesh_edges_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 7f50fcfcb2b..416ac3cbaa0 100644
--- a/source/blender/blenkernel/intern/bvhutils.c
+++ b/source/blender/blenkernel/intern/bvhutils.c
@@ -709,7 +709,7 @@ BVHTree *bvhtree_from_editmesh_edges(
 }
 
 /* Builds a bvh tree where nodes are the edges of the given dm */
-BVHTree *bvhtree_from_mesh_edges(
+static BVHTree *bvhtree_from_mesh_edges(
         BVHTreeFromMesh *data, DerivedMesh *dm,
         float epsilon, int tree_type, int axis)
 {



More information about the Bf-blender-cvs mailing list