Cleanup: prefer terms verts/polys over vertices/polygons

Follows existing naming for the most part, also use "num" as a suffix
in some instances (following our naming conventions).

2 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/geometry/intern/mesh_primitive_cuboid.cc b/source/blender/geometry/intern/mesh_primitive_cuboid.cc
index 528a9e72e9e..ad41cbd259d 100644
--- a/source/blender/geometry/intern/mesh_primitive_cuboid.cc
+++ b/source/blender/geometry/intern/mesh_primitive_cuboid.cc
@@ -54,7 +54,7 @@ struct CuboidConfig {
   }
 };
 
-static void calculate_vertices(const CuboidConfig &config, MutableSpan<MVert> verts)
+static void calculate_verts(const CuboidConfig &config, MutableSpan<MVert> verts)
 {
   const float z_bottom = -config.size.z / 2.0f;
   const float z_delta = config.size.z / config.edges_z;
@@ -409,7 +409,7 @@ Mesh *create_cuboid_mesh(const float3 &size,
   MutableSpan<MPoly> polys = mesh->polys_for_write();
   MutableSpan<MLoop> loops = mesh->loops_for_write();
 
-  calculate_vertices(config, verts);
+  calculate_verts(config, verts);
 
   calculate_polys(config, polys, loops);
   BKE_mesh_calc_edges(mesh, false, false);
diff --git a/source/blender/geometry/intern/mesh_to_volume.cc b/source/blender/geometry/intern/mesh_to_volume.cc
index 0c0d550fc99..b1c7be38609 100644
--- a/source/blender/geometry/intern/mesh_to_volume.cc
+++ b/source/blender/geometry/intern/mesh_to_volume.cc
@@ -16,7 +16,7 @@ namespace blender::geometry {
 /* This class follows the MeshDataAdapter interface from openvdb. */
 class OpenVDBMeshAdapter {
  private:
-  Span<MVert> vertices_;
+  Span<MVert> verts_;
   Span<MLoop> loops_;
   Span<MLoopTri> looptris_;
   float4x4 transform_;
@@ -30,7 +30,7 @@ class OpenVDBMeshAdapter {
 };
 
 OpenVDBMeshAdapter::OpenVDBMeshAdapter(const Mesh &mesh, float4x4 transform)
-    : vertices_(mesh.verts()), loops_(mesh.loops()), transform_(transform)
+    : verts_(mesh.verts()), loops_(mesh.loops()), transform_(transform)
 {
   /* This only updates a cache and can be considered to be logically const. */
   const MLoopTri *looptris = BKE_mesh_runtime_looptri_ensure(&mesh);
@@ -45,7 +45,7 @@ size_t OpenVDBMeshAdapter::polygonCount() const
 
 size_t OpenVDBMeshAdapter::pointCount() const
 {
-  return static_cast<size_t>(vertices_.size());
+  return static_cast<size_t>(verts_.size());
 }
 
 size_t OpenVDBMeshAdapter::vertexCount(size_t UNUSED(polygon_index)) const
@@ -59,7 +59,7 @@ void OpenVDBMeshAdapter::getIndexSpacePoint(size_t polygon_index,
                                             openvdb::Vec3d &pos) const
 {
   const MLoopTri &looptri = looptris_[polygon_index];
-  const MVert &vertex = vertices_[loops_[looptri.tri[vertex_index]].v];
+  const MVert &vertex = verts_[loops_[looptri.tri[vertex_index]].v];
   const float3 transformed_co = transform_ * float3(vertex.co);
   pos = &transformed_co.x;
 }