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, 9 insertions, 9 deletions

diff --git a/source/blender/editors/mesh/editface.cc b/source/blender/editors/mesh/editface.cc
index 26184acc8b4..68a30b0cd77 100644
--- a/source/blender/editors/mesh/editface.cc
+++ b/source/blender/editors/mesh/editface.cc
@@ -494,21 +494,21 @@ void paintvert_flush_flags(Object *ob)
 
   index_array = (const int *)CustomData_get_layer(&me_eval->vdata, CD_ORIGINDEX);
 
-  const Span<MVert> vertices = me->verts_for_write();
-  MutableSpan<MVert> vertices_eval = me_eval->verts_for_write();
+  const Span<MVert> verts = me->verts_for_write();
+  MutableSpan<MVert> verts_eval = me_eval->verts_for_write();
 
   if (index_array) {
     int orig_index;
-    for (const int i : vertices_eval.index_range()) {
+    for (const int i : verts_eval.index_range()) {
       orig_index = index_array[i];
       if (orig_index != ORIGINDEX_NONE) {
-        vertices_eval[i].flag = vertices[index_array[i]].flag;
+        verts_eval[i].flag = verts[index_array[i]].flag;
       }
     }
   }
   else {
-    for (const int i : vertices_eval.index_range()) {
-      vertices_eval[i].flag = vertices[i].flag;
+    for (const int i : verts_eval.index_range()) {
+      verts_eval[i].flag = verts[i].flag;
     }
   }
 
diff --git a/source/blender/editors/mesh/editmesh_extrude_screw.c b/source/blender/editors/mesh/editmesh_extrude_screw.c
index cc493cab0f9..5addd67ab58 100644
--- a/source/blender/editors/mesh/editmesh_extrude_screw.c
+++ b/source/blender/editors/mesh/editmesh_extrude_screw.c
@@ -41,7 +41,7 @@ static int edbm_screw_exec(bContext *C, wmOperator *op)
   int valence;
   uint objects_empty_len = 0;
   uint failed_axis_len = 0;
-  uint failed_vertices_len = 0;
+  uint failed_verts_len = 0;
 
   turns = RNA_int_get(op->ptr, "turns");
   steps = RNA_int_get(op->ptr, "steps");
@@ -97,7 +97,7 @@ static int edbm_screw_exec(bContext *C, wmOperator *op)
     }
 
     if (v1 == NULL || v2 == NULL) {
-      failed_vertices_len++;
+      failed_verts_len++;
       continue;
     }
 
@@ -151,7 +151,7 @@ static int edbm_screw_exec(bContext *C, wmOperator *op)
   if (failed_axis_len == objects_len - objects_empty_len) {
     BKE_report(op->reports, RPT_ERROR, "Invalid/unset axis");
   }
-  else if (failed_vertices_len == objects_len - objects_empty_len) {
+  else if (failed_verts_len == objects_len - objects_empty_len) {
     BKE_report(op->reports, RPT_ERROR, "You have to select a string of connected vertices too");
   }