[Bf-blender-cvs] [89058fb8967] temp-vert-normals-cleanup: Cleanup: Rename `BKE_mesh_face_normals_for_write` -> `BKE_mesh_poly_normals_for_write`
Hans Goudey
noreply at git.blender.org
Wed Dec 29 21:45:39 CET 2021
Commit: 89058fb896796c84e3ea278c3a97201736804b17
Author: Hans Goudey
Date: Wed Dec 29 12:53:38 2021 -0600
Branches: temp-vert-normals-cleanup
https://developer.blender.org/rB89058fb896796c84e3ea278c3a97201736804b17
Cleanup: Rename `BKE_mesh_face_normals_for_write` -> `BKE_mesh_poly_normals_for_write`
===================================================================
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/intern/mesh_normals.cc
M source/blender/bmesh/intern/bmesh_mesh_convert.c
M source/blender/editors/mesh/mesh_data.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 5f23486cd16..c8f5c1fc1ed 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -419,7 +419,7 @@ float (*BKE_mesh_vertex_normals_for_write(struct Mesh *mesh))[3];
* Make sure the face normal data layer exists and return it.
* Used for manually assigning face normals. Clears the dirty flag.
*/
-float (*BKE_mesh_face_normals_for_write(struct Mesh *mesh))[3];
+float (*BKE_mesh_poly_normals_for_write(struct Mesh *mesh))[3];
/**
* \warning May still return null if the mesh is empty.
diff --git a/source/blender/blenkernel/intern/mesh_normals.cc b/source/blender/blenkernel/intern/mesh_normals.cc
index 06fe054b1f6..353fec38292 100644
--- a/source/blender/blenkernel/intern/mesh_normals.cc
+++ b/source/blender/blenkernel/intern/mesh_normals.cc
@@ -127,7 +127,7 @@ float (*BKE_mesh_vertex_normals_for_write(Mesh *mesh))[3]
&mesh->vdata, CD_NORMAL, CD_CALLOC, nullptr, mesh->totvert);
}
-float (*BKE_mesh_face_normals_for_write(Mesh *mesh))[3]
+float (*BKE_mesh_poly_normals_for_write(Mesh *mesh))[3]
{
mesh->runtime.cd_dirty_poly &= ~CD_MASK_NORMAL;
return (float(*)[3])CustomData_add_layer(
diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert.c b/source/blender/bmesh/intern/bmesh_mesh_convert.c
index 17fa60c43b0..f7902bedac4 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_convert.c
+++ b/source/blender/bmesh/intern/bmesh_mesh_convert.c
@@ -639,7 +639,7 @@ void BM_mesh_bm_to_me(Main *bmain, BMesh *bm, Mesh *me, const struct BMeshToMesh
CustomData_add_layer(&me->edata, CD_MEDGE, CD_ASSIGN, medge, me->totedge);
CustomData_add_layer(&me->ldata, CD_MLOOP, CD_ASSIGN, mloop, me->totloop);
CustomData_add_layer(&me->pdata, CD_MPOLY, CD_ASSIGN, mpoly, me->totpoly);
- float(*face_normals)[3] = BKE_mesh_face_normals_for_write(me);
+ float(*face_normals)[3] = BKE_mesh_poly_normals_for_write(me);
float(*vert_normals)[3] = BKE_mesh_vertex_normals_for_write(me);
me->cd_flag = BM_mesh_cd_flag_from_bmesh(bm);
diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c
index 1cbdf75d218..0d3aaf6278c 100644
--- a/source/blender/editors/mesh/mesh_data.c
+++ b/source/blender/editors/mesh/mesh_data.c
@@ -1026,7 +1026,7 @@ static int mesh_customdata_custom_splitnormals_add_exec(bContext *C, wmOperator
me->mloop,
me->totloop,
me->mpoly,
- BKE_mesh_face_normals_for_write(me),
+ BKE_mesh_poly_normals_for_write(me),
me->totpoly,
me->smoothresh);
}
More information about the Bf-blender-cvs
mailing list