[Bf-blender-cvs] [0a2c35841e6] temp-vert-normals-cleanup: Change naming `BKE_mesh_ensure_face_normals` -> ``BKE_mesh_poly_normals_ensure`
Hans Goudey
noreply at git.blender.org
Sat Dec 11 19:02:54 CET 2021
Commit: 0a2c35841e6f6986c35e057f9a8690b428ac2b17
Author: Hans Goudey
Date: Sat Dec 11 12:01:21 2021 -0600
Branches: temp-vert-normals-cleanup
https://developer.blender.org/rB0a2c35841e6f6986c35e057f9a8690b428ac2b17
Change naming `BKE_mesh_ensure_face_normals` -> ``BKE_mesh_poly_normals_ensure`
===================================================================
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/BKE_mesh_remap.h
M source/blender/blenkernel/intern/bvhutils.cc
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/data_transfer.c
M source/blender/blenkernel/intern/displist.cc
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/effect.c
M source/blender/blenkernel/intern/fluid.c
M source/blender/blenkernel/intern/geometry_component_mesh.cc
M source/blender/blenkernel/intern/gpencil_geom.cc
M source/blender/blenkernel/intern/key.c
M source/blender/blenkernel/intern/mesh.cc
M source/blender/blenkernel/intern/mesh_convert.cc
M source/blender/blenkernel/intern/mesh_iterators.c
M source/blender/blenkernel/intern/mesh_mirror.c
M source/blender/blenkernel/intern/mesh_normals.cc
M source/blender/blenkernel/intern/mesh_remap.c
M source/blender/blenkernel/intern/mesh_tangent.c
M source/blender/blenkernel/intern/mesh_validate.c
M source/blender/blenkernel/intern/object_dupli.cc
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/particle_distribute.c
M source/blender/blenkernel/intern/pbvh.c
M source/blender/blenkernel/intern/shrinkwrap.c
M source/blender/bmesh/intern/bmesh_mesh_convert.c
M source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
M source/blender/editors/armature/meshlaplacian.c
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/io/alembic/exporter/abc_writer_hair.cc
M source/blender/io/collada/GeometryExporter.cpp
M source/blender/io/usd/intern/usd_writer_mesh.cc
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/modifiers/intern/MOD_array.c
M source/blender/modifiers/intern/MOD_displace.c
M source/blender/modifiers/intern/MOD_normal_edit.c
M source/blender/modifiers/intern/MOD_solidify_extrude.c
M source/blender/modifiers/intern/MOD_util.c
M source/blender/modifiers/intern/MOD_wave.c
M source/blender/modifiers/intern/MOD_weighted_normal.c
M source/blender/nodes/geometry/nodes/node_geo_input_normal.cc
M source/blender/render/intern/bake.c
M source/blender/render/intern/texture_pointdensity.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 60b7acab7f1..74f7eea0871 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -384,7 +384,7 @@ void BKE_mesh_normals_tag_dirty(struct Mesh *mesh);
/**
* Calculate face normals directly into a result array.
*
- * \note Usually #BKE_mesh_ensure_face_normals is the preferred way to access face normals,
+ * \note Usually #BKE_mesh_poly_normals_ensure is the preferred way to access face normals,
* since they may already be calculated and cached on the mesh.
*/
void BKE_mesh_calc_normals_poly(const struct MVert *mvert,
@@ -399,7 +399,7 @@ void BKE_mesh_calc_normals_poly(const struct MVert *mvert,
* Calculate vertex and face normals, storing the result in custom data layers on the mesh.
*
* \note It is usually preferrable to calculate normals lazily with
- * #BKE_mesh_ensure_vertex_normals, but some areas (perhaps unnecessarily)
+ * #BKE_mesh_vertex_normals_ensure, but some areas (perhaps unnecessarily)
* can also calculate them eagerly.
*/
void BKE_mesh_calc_normals(struct Mesh *me);
@@ -424,12 +424,12 @@ float (*BKE_mesh_face_normals_for_write(struct Mesh *mesh))[3];
/**
* \warning May still return null if the mesh is empty.
*/
-const float (*BKE_mesh_ensure_vertex_normals(const struct Mesh *mesh))[3];
+const float (*BKE_mesh_vertex_normals_ensure(const struct Mesh *mesh))[3];
/**
* \warning May still return null if the mesh is empty.
*/
-const float (*BKE_mesh_ensure_face_normals(const struct Mesh *mesh))[3];
+const float (*BKE_mesh_poly_normals_ensure(const struct Mesh *mesh))[3];
/**
* Called after calculating all modifiers.
@@ -581,6 +581,7 @@ void BKE_lnor_space_custom_normal_to_data(MLoopNorSpace *lnor_space,
* (splitting edges).
*/
void BKE_mesh_normals_loop_split(const struct MVert *mverts,
+ const float (*vert_normals)[3],
const int numVerts,
struct MEdge *medges,
const int numEdges,
@@ -589,7 +590,6 @@ void BKE_mesh_normals_loop_split(const struct MVert *mverts,
const int numLoops,
struct MPoly *mpolys,
const float (*polynors)[3],
- const float (*vert_normals)[3],
const int numPolys,
const bool use_split_normals,
const float split_angle,
diff --git a/source/blender/blenkernel/BKE_mesh_remap.h b/source/blender/blenkernel/BKE_mesh_remap.h
index fa468952d87..400c76dad25 100644
--- a/source/blender/blenkernel/BKE_mesh_remap.h
+++ b/source/blender/blenkernel/BKE_mesh_remap.h
@@ -210,8 +210,8 @@ void BKE_mesh_remap_calc_loops_from_mesh(const int mode,
const struct SpaceTransform *space_transform,
const float max_dist,
const float ray_radius,
+ struct Mesh *mesh_dst,
struct MVert *verts_dst,
- const float (*vert_normals_dst)[3],
const int numverts_dst,
struct MEdge *edges_dst,
const int numedges_dst,
@@ -233,6 +233,7 @@ void BKE_mesh_remap_calc_polys_from_mesh(const int mode,
const struct SpaceTransform *space_transform,
const float max_dist,
const float ray_radius,
+ struct Mesh *mesh_dst,
struct MVert *verts_dst,
const int numverts_dst,
struct MLoop *loops_dst,
diff --git a/source/blender/blenkernel/intern/bvhutils.cc b/source/blender/blenkernel/intern/bvhutils.cc
index 70e4642c735..8f25659384e 100644
--- a/source/blender/blenkernel/intern/bvhutils.cc
+++ b/source/blender/blenkernel/intern/bvhutils.cc
@@ -1600,7 +1600,7 @@ BVHTree *BKE_bvhtree_from_mesh_get(struct BVHTreeFromMesh *data,
memset(data, 0, sizeof(*data));
}
- data->vert_normals = BKE_mesh_ensure_vertex_normals(mesh);
+ data->vert_normals = BKE_mesh_vertex_normals_ensure(mesh);
return tree;
}
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 0416e34acab..8d0498af964 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -544,7 +544,7 @@ static void contarget_get_mesh_mat(Object *ob, const char *substring, float mat[
float vec[3] = {0.0f, 0.0f, 0.0f};
float normal[3] = {0.0f, 0.0f, 0.0f};
float weightsum = 0.0f;
- const float(*vert_normals)[3] = BKE_mesh_ensure_vertex_normals(me_eval);
+ const float(*vert_normals)[3] = BKE_mesh_vertex_normals_ensure(me_eval);
if (me_eval) {
const MDeformVert *dvert = CustomData_get_layer(&me_eval->vdata, CD_MDEFORMVERT);
int numVerts = me_eval->totvert;
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c
index fabd9125976..a2c4b8695d8 100644
--- a/source/blender/blenkernel/intern/data_transfer.c
+++ b/source/blender/blenkernel/intern/data_transfer.c
@@ -295,6 +295,7 @@ static void data_transfer_dtdata_type_preprocess(Mesh *me_src,
}
if (dirty_nors_dst || do_loop_nors_dst) {
BKE_mesh_normals_loop_split(verts_dst,
+ BKE_mesh_vertex_normals_ensure(me_dst),
num_verts_dst,
edges_dst,
num_edges_dst,
@@ -302,8 +303,7 @@ static void data_transfer_dtdata_type_preprocess(Mesh *me_src,
loop_nors_dst,
num_loops_dst,
polys_dst,
- BKE_mesh_ensure_face_normals(me_dst),
- BKE_mesh_ensure_vertex_normals(me_dst),
+ BKE_mesh_ensure_poly_normals(me_dst),
num_polys_dst,
use_split_nors_dst,
split_angle_dst,
@@ -351,7 +351,7 @@ static void data_transfer_dtdata_type_postprocess(Object *UNUSED(ob_src),
/* Note loop_nors_dst contains our custom normals as transferred from source... */
BKE_mesh_normals_loop_custom_set(verts_dst,
- BKE_mesh_ensure_vertex_normals(me_dst),
+ BKE_mesh_vertex_normals_ensure(me_dst),
num_verts_dst,
edges_dst,
num_edges_dst,
@@ -1669,8 +1669,8 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph,
space_transform,
max_distance,
ray_radius,
+ me_dst,
verts_dst,
- BKE_mesh_ensure_vertex_normals(me_dst),
num_verts_dst,
edges_dst,
num_edges_dst,
@@ -1761,6 +1761,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph,
space_transform,
max_distance,
ray_radius,
+ me_dst,
verts_dst,
num_verts_dst,
loops_dst,
diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc
index 51a5946c48a..db70d26a554 100644
--- a/source/blender/blenkernel/intern/displist.cc
+++ b/source/blender/blenkernel/intern/displist.cc
@@ -904,7 +904,7 @@ static GeometrySet curve_calc_modifiers_post(Depsgraph *depsgraph,
int totvert;
float(*vertex_coords)[3] = BKE_mesh_vert_coords_alloc(mesh, &totvert);
if (mti->dependsOnNormals != nullptr && mti->dependsOnNormals(md)) {
- BKE_mesh_ensure_vertex_normals(mesh);
+ BKE_mesh_vertex_normals_ensure(mesh);
}
mti->deformVerts(md, &mectx_deform, mesh, vertex_coords, totvert);
BKE_mesh_vert_coords_apply(mesh, vertex_coords);
@@ -912,7 +912,7 @@ static GeometrySet curve_calc_modifiers_post(Depsgraph *depsgraph,
}
else {
if (mti->dependsOnNormals != nullptr && mti->dependsOnNormals(md)) {
- BKE_mesh_ensure_vertex_normals(mesh);
+ BKE_mesh_vertex_normals_ensure(mesh);
}
Mesh *output_mesh = mti->modifyMesh(md, &mectx_apply, mesh);
if (mesh != output_mesh) {
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 8219e0520ec..64e0427a810 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -1830,7 +1830,7 @@ static void dynamicPaint_applySurfaceDisplace(DynamicPaintSurface *surface, Mesh
DynamicPaintModifierApplyData data = {
.surface = surface,
.mvert = mvert,
- .vert_normals = BKE_mesh_ensure_vertex_normals(result),
+ .vert_normals = BKE_mesh_vertex_normals_ensure(result),
};
TaskParallelSettings settings;
BLI_parallel_range_settings_defaults(&settings);
@@ -2027,7 +2027,7 @@ static Mesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *p
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list