[Bf-blender-cvs] [8c11c044489] master: Cleanup: Rename adjacent mesh loop accessors

[Hans Goudey]

Commit: 8c11c0444891d5bc8f654e42b0f24f6337a77561
Author: Hans Goudey
Date:   Sun Dec 11 23:14:01 2022 -0600
Branches: master
https://developer.blender.org/rB8c11c0444891d5bc8f654e42b0f24f6337a77561

Cleanup: Rename adjacent mesh loop accessors

But the common, more important part of the function names at the
beginning, to make them easier to find and more consistent.

===================================================================

M	source/blender/blenkernel/BKE_mesh_mapping.h
M	source/blender/blenkernel/intern/geometry_component_mesh.cc
M	source/blender/blenkernel/intern/mesh_normals.cc
M	source/blender/nodes/geometry/nodes/node_geo_edge_split.cc
M	source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc

===================================================================

diff --git a/source/blender/blenkernel/BKE_mesh_mapping.h b/source/blender/blenkernel/BKE_mesh_mapping.h
index e218ee72694..b49d61ac0a8 100644
--- a/source/blender/blenkernel/BKE_mesh_mapping.h
+++ b/source/blender/blenkernel/BKE_mesh_mapping.h
@@ -356,12 +356,12 @@ Array<Vector<int>> build_vert_to_loop_map(Span<MLoop> loops, int verts_num);
 Array<Vector<int>> build_edge_to_loop_map(Span<MLoop> loops, int edges_num);
 Vector<Vector<int>> build_edge_to_loop_map_resizable(Span<MLoop> loops, int edges_num);
 
-inline int previous_poly_loop(const MPoly &poly, int loop_i)
+inline int poly_loop_prev(const MPoly &poly, int loop_i)
 {
   return loop_i - 1 + (loop_i == poly.loopstart) * poly.totloop;
 }
 
-inline int next_poly_loop(const MPoly &poly, int loop_i)
+inline int poly_loop_next(const MPoly &poly, int loop_i)
 {
   if (loop_i == poly.loopstart + poly.totloop - 1) {
     return poly.loopstart;
diff --git a/source/blender/blenkernel/intern/geometry_component_mesh.cc b/source/blender/blenkernel/intern/geometry_component_mesh.cc
index c30426a8d98..87ddb76171e 100644
--- a/source/blender/blenkernel/intern/geometry_component_mesh.cc
+++ b/source/blender/blenkernel/intern/geometry_component_mesh.cc
@@ -618,7 +618,7 @@ void adapt_mesh_domain_edge_to_corner_impl(const Mesh &mesh,
 
     /* For every corner, mix the values from the adjacent edges on the face. */
     for (const int loop_index : IndexRange(poly.loopstart, poly.totloop)) {
-      const int loop_index_prev = mesh_topology::previous_poly_loop(poly, loop_index);
+      const int loop_index_prev = mesh_topology::poly_loop_prev(poly, loop_index);
       const MLoop &loop = loops[loop_index];
       const MLoop &loop_prev = loops[loop_index_prev];
       mixer.mix_in(loop_index, old_values[loop.e]);
@@ -645,7 +645,7 @@ void adapt_mesh_domain_edge_to_corner_impl(const Mesh &mesh,
     for (const int poly_index : range) {
       const MPoly &poly = polys[poly_index];
       for (const int loop_index : IndexRange(poly.loopstart, poly.totloop)) {
-        const int loop_index_prev = mesh_topology::previous_poly_loop(poly, loop_index);
+        const int loop_index_prev = mesh_topology::poly_loop_prev(poly, loop_index);
         const MLoop &loop = loops[loop_index];
         const MLoop &loop_prev = loops[loop_index_prev];
         if (old_values[loop.e] && old_values[loop_prev.e]) {
diff --git a/source/blender/blenkernel/intern/mesh_normals.cc b/source/blender/blenkernel/intern/mesh_normals.cc
index f568111f2e0..b93892b639f 100644
--- a/source/blender/blenkernel/intern/mesh_normals.cc
+++ b/source/blender/blenkernel/intern/mesh_normals.cc
@@ -1390,7 +1390,7 @@ static void loop_split_generator(TaskPool *pool, LoopSplitTaskDataCommon *common
     const MPoly &poly = polys[mp_index];
 
     for (const int ml_curr_index : IndexRange(poly.loopstart, poly.totloop)) {
-      const int ml_prev_index = mesh_topology::previous_poly_loop(poly, ml_curr_index);
+      const int ml_prev_index = mesh_topology::poly_loop_prev(poly, ml_curr_index);
 
 #if 0
       printf("Checking loop %d / edge %u / vert %u (sharp edge: %d, skiploop: %d)",
diff --git a/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc b/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc
index f44ab44aacd..30c3e710432 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc
@@ -251,8 +251,8 @@ static void split_vertex_per_fan(const int vertex,
 static int adjacent_edge(Span<MLoop> loops, const int loop_i, const MPoly &poly, const int vertex)
 {
   const int adjacent_loop_i = (loops[loop_i].v == vertex) ?
-                                  bke::mesh_topology::previous_poly_loop(poly, loop_i) :
-                                  bke::mesh_topology::next_poly_loop(poly, loop_i);
+                                  bke::mesh_topology::poly_loop_prev(poly, loop_i) :
+                                  bke::mesh_topology::poly_loop_next(poly, loop_i);
   return loops[adjacent_loop_i].e;
 }
 
diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc
index e46061e0d65..08085d2619a 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_topology_edges_of_corner.cc
@@ -88,7 +88,7 @@ class CornerPreviousEdgeFieldInput final : public bke::MeshFieldInput {
         [polys, loops, loop_to_poly_map = std::move(loop_to_poly_map)](const int corner_i) {
           const int poly_i = loop_to_poly_map[corner_i];
           const MPoly &poly = polys[poly_i];
-          const int corner_i_prev = bke::mesh_topology::previous_poly_loop(poly, corner_i);
+          const int corner_i_prev = bke::mesh_topology::poly_loop_prev(poly, corner_i);
           return loops[corner_i_prev].e;
         });
   }