[Bf-blender-cvs] [dd51d0425a7] temp-vert-normals-cleanup: More renaming of function
Hans Goudey
noreply at git.blender.org
Sun Dec 12 18:59:15 CET 2021
Commit: dd51d0425a774f897e05fcdd8c9d955114be4b06
Author: Hans Goudey
Date: Sun Dec 12 11:32:54 2021 -0600
Branches: temp-vert-normals-cleanup
https://developer.blender.org/rBdd51d0425a774f897e05fcdd8c9d955114be4b06
More renaming of function
===================================================================
M source/blender/blenkernel/intern/data_transfer.c
M source/blender/blenkernel/intern/mesh.cc
M source/blender/blenkernel/intern/mesh_tangent.c
M source/blender/blenkernel/intern/shrinkwrap.c
M source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
M source/blender/editors/armature/meshlaplacian.c
M source/blender/modifiers/intern/MOD_normal_edit.c
M source/blender/modifiers/intern/MOD_weighted_normal.c
M source/blender/nodes/geometry/nodes/node_geo_input_normal.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c
index a2c4b8695d8..12c7b8f3c8b 100644
--- a/source/blender/blenkernel/intern/data_transfer.c
+++ b/source/blender/blenkernel/intern/data_transfer.c
@@ -303,7 +303,7 @@ static void data_transfer_dtdata_type_preprocess(Mesh *me_src,
loop_nors_dst,
num_loops_dst,
polys_dst,
- BKE_mesh_ensure_poly_normals(me_dst),
+ BKE_mesh_poly_normals_ensure(me_dst),
num_polys_dst,
use_split_nors_dst,
split_angle_dst,
diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index 1a0b185eb1e..679f4165a7b 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -93,7 +93,7 @@ static void mesh_init_data(ID *id)
/* A newly created mesh does not have normals, so tag them dirty. This will be cleared by
* retrieving the normal layer for manually writing to it, or calling functions like
- * #BKE_mesh_ensure_poly_normals. */
+ * #BKE_mesh_poly_normals_ensure. */
BKE_mesh_normals_tag_dirty(mesh);
mesh->face_sets_color_seed = BLI_hash_int(PIL_check_seconds_timer_i() & UINT_MAX);
@@ -1918,7 +1918,7 @@ void BKE_mesh_calc_normals_split_ex(Mesh *mesh, MLoopNorSpaceArray *r_lnors_spac
r_loopnors,
mesh->totloop,
mesh->mpoly,
- BKE_mesh_ensure_poly_normals(mesh),
+ BKE_mesh_poly_normals_ensure(mesh),
mesh->totpoly,
use_split_normals,
split_angle,
diff --git a/source/blender/blenkernel/intern/mesh_tangent.c b/source/blender/blenkernel/intern/mesh_tangent.c
index d437cec0c0c..73cef6b925b 100644
--- a/source/blender/blenkernel/intern/mesh_tangent.c
+++ b/source/blender/blenkernel/intern/mesh_tangent.c
@@ -746,7 +746,7 @@ void BKE_mesh_calc_loop_tangents(Mesh *me_eval,
tangent_names,
tangent_names_len,
BKE_mesh_vertex_normals_ensure(me_eval),
- BKE_mesh_ensure_poly_normals(me_eval),
+ BKE_mesh_poly_normals_ensure(me_eval),
CustomData_get_layer(&me_eval->ldata, CD_NORMAL),
CustomData_get_layer(&me_eval->vdata, CD_ORCO), /* may be NULL */
/* result */
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c
index 9652460e119..0ecea6dd2da 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -146,7 +146,7 @@ bool BKE_shrinkwrap_init_tree(
}
if (force_normals || BKE_shrinkwrap_needs_normals(shrinkType, shrinkMode)) {
- data->pnors = BKE_mesh_ensure_poly_normals(mesh);
+ data->pnors = BKE_mesh_poly_normals_ensure(mesh);
if ((mesh->flag & ME_AUTOSMOOTH) != 0) {
data->clnors = CustomData_get_layer(&mesh->ldata, CD_NORMAL);
}
diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
index a4213ba848f..e357e338da2 100644
--- a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
+++ b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
@@ -381,7 +381,7 @@ void mesh_render_data_update_normals(MeshRenderData *mr, const eMRDataType data_
/* Mesh */
mr->vert_normals = BKE_mesh_vertex_normals_ensure(mr->me);
if (data_flag & (MR_DATA_POLY_NOR | MR_DATA_LOOP_NOR | MR_DATA_TAN_LOOP_NOR)) {
- mr->poly_normals = BKE_mesh_ensure_poly_normals(mr->me);
+ mr->poly_normals = BKE_mesh_poly_normals_ensure(mr->me);
}
if (((data_flag & MR_DATA_LOOP_NOR) && is_auto_smooth) || (data_flag & MR_DATA_TAN_LOOP_NOR)) {
mr->loop_normals = MEM_mallocN(sizeof(*mr->loop_normals) * mr->loop_len, __func__);
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c
index 16a9963c6f7..2853a5fa106 100644
--- a/source/blender/editors/armature/meshlaplacian.c
+++ b/source/blender/editors/armature/meshlaplacian.c
@@ -1619,7 +1619,7 @@ static void harmonic_coordinates_bind(MeshDeformModifierData *mmd, MeshDeformBin
mdb->cagemesh_cache.mloop = me->mloop;
mdb->cagemesh_cache.looptri = BKE_mesh_runtime_looptri_ensure(me);
/* can be NULL */
- mdb->cagemesh_cache.poly_nors = BKE_mesh_ensure_poly_normals(me);
+ mdb->cagemesh_cache.poly_nors = BKE_mesh_poly_normals_ensure(me);
}
/* make bounding box equal size in all directions, add padding, and compute
diff --git a/source/blender/modifiers/intern/MOD_normal_edit.c b/source/blender/modifiers/intern/MOD_normal_edit.c
index dc2662a07a5..47eb445f20d 100644
--- a/source/blender/modifiers/intern/MOD_normal_edit.c
+++ b/source/blender/modifiers/intern/MOD_normal_edit.c
@@ -551,7 +551,7 @@ static Mesh *normalEditModifier_do(NormalEditModifierData *enmd,
/* Compute poly (always needed) and vert normals. */
const float(*vert_normals)[3] = BKE_mesh_vertex_normals_ensure(mesh);
- const float(*poly_normals)[3] = BKE_mesh_ensure_poly_normals(mesh);
+ const float(*poly_normals)[3] = BKE_mesh_poly_normals_ensure(mesh);
clnors = CustomData_get_layer(ldata, CD_CUSTOMLOOPNORMAL);
if (use_current_clnors) {
diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.c b/source/blender/modifiers/intern/MOD_weighted_normal.c
index 1df5bf0f691..bfe389eb080 100644
--- a/source/blender/modifiers/intern/MOD_weighted_normal.c
+++ b/source/blender/modifiers/intern/MOD_weighted_normal.c
@@ -647,7 +647,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
.split_angle = split_angle,
.mpoly = mpoly,
- .polynors = BKE_mesh_ensure_poly_normals(mesh),
+ .polynors = BKE_mesh_poly_normals_ensure(mesh),
.poly_strength = CustomData_get_layer_named(
&result->pdata, CD_PROP_INT32, MOD_WEIGHTEDNORMALS_FACEWEIGHT_CDLAYER_ID),
diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_normal.cc b/source/blender/nodes/geometry/nodes/node_geo_input_normal.cc
index 884e0bc8caf..9b162f84c0d 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_input_normal.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_input_normal.cc
@@ -39,7 +39,7 @@ static VArray<float3> construct_mesh_normals_gvarray(const MeshComponent &mesh_c
switch (domain) {
case ATTR_DOMAIN_FACE: {
return VArray<float3>::ForSpan(
- {(float3 *)BKE_mesh_ensure_poly_normals(&mesh), mesh.totpoly});
+ {(float3 *)BKE_mesh_poly_normals_ensure(&mesh), mesh.totpoly});
}
case ATTR_DOMAIN_POINT: {
return VArray<float3>::ForSpan(
@@ -67,7 +67,7 @@ static VArray<float3> construct_mesh_normals_gvarray(const MeshComponent &mesh_c
* component's generic domain interpolation is fine, the data will still be normalized,
* since the face normal is just copied to every corner. */
return mesh_component.attribute_try_adapt_domain(
- VArray<float3>::ForSpan({(float3 *)BKE_mesh_ensure_poly_normals(&mesh), mesh.totpoly}),
+ VArray<float3>::ForSpan({(float3 *)BKE_mesh_poly_normals_ensure(&mesh), mesh.totpoly}),
ATTR_DOMAIN_FACE,
ATTR_DOMAIN_CORNER);
}
More information about the Bf-blender-cvs
mailing list