From d9b1592c886783fbb1c39a016a91b403db8e8660 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 20 Jun 2021 17:21:50 +1000 Subject: Cleanup: make BKE_mesh_loops_to_tessdata a static function --- source/blender/blenkernel/BKE_mesh.h | 7 ------- source/blender/blenkernel/intern/customdata.c | 2 +- source/blender/blenkernel/intern/mesh_tessellate.c | 16 ++++++++-------- 3 files changed, 9 insertions(+), 16 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 87964307105..8ddfb0c8eb2 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -274,13 +274,6 @@ void BKE_mesh_vert_normals_apply(struct Mesh *mesh, const short (*vert_normals)[ /* *** mesh_tessellate.c *** */ -void BKE_mesh_loops_to_tessdata(struct CustomData *fdata, - struct CustomData *ldata, - struct MFace *mface, - const int *polyindices, - unsigned int (*loopindices)[4], - const int num_faces); - int BKE_mesh_tessface_calc_ex(struct CustomData *fdata, struct CustomData *ldata, struct CustomData *pdata, diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index ccf002b4c6f..b1bb8b9715e 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -1970,7 +1970,7 @@ const CustomData_MeshMasks CD_MASK_BMESH = { CD_MASK_SCULPT_FACE_SETS), }; /** - * cover values copied by #BKE_mesh_loops_to_tessdata + * cover values copied by #mesh_loops_to_tessdata */ const CustomData_MeshMasks CD_MASK_FACECORNERS = { .vmask = 0, diff --git a/source/blender/blenkernel/intern/mesh_tessellate.c b/source/blender/blenkernel/intern/mesh_tessellate.c index 797db4df97f..213f2929d63 100644 --- a/source/blender/blenkernel/intern/mesh_tessellate.c +++ b/source/blender/blenkernel/intern/mesh_tessellate.c @@ -62,12 +62,12 @@ * \note when mface is not NULL, mface[face_index].v4 * is used to test quads, else, loopindices[face_index][3] is used. */ -void BKE_mesh_loops_to_tessdata(CustomData *fdata, - CustomData *ldata, - MFace *mface, - const int *polyindices, - uint (*loopindices)[4], - const int num_faces) +static void mesh_loops_to_tessdata(CustomData *fdata, + CustomData *ldata, + MFace *mface, + const int *polyindices, + uint (*loopindices)[4], + const int num_faces) { /* NOTE(mont29): performances are sub-optimal when we get a NULL #MFace, * we could be ~25% quicker with dedicated code. @@ -391,9 +391,9 @@ int BKE_mesh_tessface_calc_ex(CustomData *fdata, * Currently, our tfaces' fourth vertex index might be 0 even for a quad. * However, we know our fourth loop index is never 0 for quads * (because they are sorted for polygons, and our quads are still mere copies of their polygons). - * So we pass NULL as MFace pointer, and #BKE_mesh_loops_to_tessdata + * So we pass NULL as MFace pointer, and #mesh_loops_to_tessdata * will use the fourth loop index as quad test. */ - BKE_mesh_loops_to_tessdata(fdata, ldata, NULL, mface_to_poly_map, lindices, totface); + mesh_loops_to_tessdata(fdata, ldata, NULL, mface_to_poly_map, lindices, totface); /* NOTE: quad detection issue - fourth vertidx vs fourth loopidx: * ...However, most TFace code uses 'MFace->v4 == 0' test to check whether it is a tri or quad. -- cgit v1.2.3