diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-01-14 05:00:11 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-01-14 05:00:11 +0300 |
commit | f5604af464cd2e2cbb271378df2827cbe6eaffe3 (patch) | |
tree | c803fb688ae839c82d7dbc0e571cdc8a34bbe14e /source/blender | |
parent | bc3db85da8c6aa101d6ccf8d50f8d11ee1b143de (diff) |
Cleanup: use BM_mesh_* prefix for BMesh functions
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/editmesh.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.h | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.c | 2 | ||||
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_types.c | 2 | ||||
-rw-r--r-- | source/blender/python/mathutils/mathutils_bvhtree.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c index 87a5c6f149f..fea3c24d322 100644 --- a/source/blender/blenkernel/intern/editmesh.c +++ b/source/blender/blenkernel/intern/editmesh.c @@ -142,7 +142,7 @@ static void editmesh_tessface_calc_intern(BMEditMesh *em) em->looptris = looptris; /* after allocating the em->looptris, we're ready to tessellate */ - BM_bmesh_calc_tessellation(em->bm, em->looptris, &em->tottri); + BM_mesh_calc_tessellation(em->bm, em->looptris, &em->tottri); } diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index 8d8db799afa..40f6078dc0b 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -1267,12 +1267,12 @@ void BM_face_as_array_loop_quad(BMFace *f, BMLoop *r_loops[4]) /** - * \brief BM_bmesh_calc_tessellation get the looptris and its number from a certain bmesh + * \brief BM_mesh_calc_tessellation get the looptris and its number from a certain bmesh * \param looptris * * \note \a looptris Must be pre-allocated to at least the size of given by: poly_to_tri_count */ -void BM_bmesh_calc_tessellation(BMesh *bm, BMLoop *(*looptris)[3], int *r_looptris_tot) +void BM_mesh_calc_tessellation(BMesh *bm, BMLoop *(*looptris)[3], int *r_looptris_tot) { /* use this to avoid locking pthread for _every_ polygon * and calling the fill function */ diff --git a/source/blender/bmesh/intern/bmesh_polygon.h b/source/blender/bmesh/intern/bmesh_polygon.h index c84f4798ee4..a1d17101ece 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.h +++ b/source/blender/bmesh/intern/bmesh_polygon.h @@ -32,7 +32,7 @@ struct Heap; #include "BLI_compiler_attrs.h" -void BM_bmesh_calc_tessellation(BMesh *bm, BMLoop *(*looptris)[3], int *r_looptris_tot); +void BM_mesh_calc_tessellation(BMesh *bm, BMLoop *(*looptris)[3], int *r_looptris_tot); void BM_face_calc_tessellation( const BMFace *f, const bool use_fixed_quad, diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 750fb472cc8..03ff902162d 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -234,7 +234,7 @@ static DerivedMesh *applyModifier_bmesh( looptris = MEM_mallocN(sizeof(*looptris) * looptris_tot, __func__); - BM_bmesh_calc_tessellation(bm, looptris, &tottri); + BM_mesh_calc_tessellation(bm, looptris, &tottri); /* postpone this until after tessellating * so we can use the original normals before the vertex are moved */ diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index fc25a79f77a..833e8e32147 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -1257,7 +1257,7 @@ static PyObject *bpy_bmesh_calc_tessface(BPy_BMElem *self) looptris_tot = poly_to_tri_count(bm->totface, bm->totloop); looptris = PyMem_MALLOC(sizeof(*looptris) * looptris_tot); - BM_bmesh_calc_tessellation(bm, looptris, &tottri); + BM_mesh_calc_tessellation(bm, looptris, &tottri); ret = PyList_New(tottri); for (i = 0; i < tottri; i++) { diff --git a/source/blender/python/mathutils/mathutils_bvhtree.c b/source/blender/python/mathutils/mathutils_bvhtree.c index b3b9d4a86dc..20baf6c403a 100644 --- a/source/blender/python/mathutils/mathutils_bvhtree.c +++ b/source/blender/python/mathutils/mathutils_bvhtree.c @@ -894,7 +894,7 @@ static PyObject *C_BVHTree_FromBMesh(PyObject *UNUSED(cls), PyObject *args, PyOb looptris = MEM_mallocN(sizeof(*looptris) * (size_t)tris_len, __func__); - BM_bmesh_calc_tessellation(bm, looptris, &tris_len_dummy); + BM_mesh_calc_tessellation(bm, looptris, &tris_len_dummy); BLI_assert(tris_len_dummy == (int)tris_len); } |