[Bf-blender-cvs] [494e2e78d98] refactor-mesh-position-generic: Revert unnecessary changes from bad merge

[Hans Goudey]

Commit: 494e2e78d988a9ac9988a3d7fca28566574141e9
Author: Hans Goudey
Date:   Mon Jan 2 12:15:13 2023 -0500
Branches: refactor-mesh-position-generic
https://developer.blender.org/rB494e2e78d988a9ac9988a3d7fca28566574141e9

Revert unnecessary changes from bad merge

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

M	source/blender/blenkernel/intern/mball_tessellate.cc
M	source/blender/modifiers/intern/MOD_screw.cc

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

diff --git a/source/blender/blenkernel/intern/mball_tessellate.cc b/source/blender/blenkernel/intern/mball_tessellate.cc
index 5c4ab6b566d..fc88e1ae1b4 100644
--- a/source/blender/blenkernel/intern/mball_tessellate.cc
+++ b/source/blender/blenkernel/intern/mball_tessellate.cc
@@ -1462,7 +1462,7 @@ Mesh *BKE_mball_polygonize(Depsgraph *depsgraph, Scene *scene, Object *ob)
 
   Mesh *mesh = (Mesh *)BKE_id_new_nomain(ID_ME, ((ID *)ob->data)->name + 2);
 
-  mesh->totvert = (int)process.curvertex;
+  mesh->totvert = int(process.curvertex);
   CustomData_add_layer_named(
       &mesh->vdata, CD_PROP_FLOAT3, CD_ASSIGN, process.co, mesh->totvert, "position");
   process.co = nullptr;
diff --git a/source/blender/modifiers/intern/MOD_screw.cc b/source/blender/modifiers/intern/MOD_screw.cc
index 6491dcdbf0f..c0f7b262b1a 100644
--- a/source/blender/modifiers/intern/MOD_screw.cc
+++ b/source/blender/modifiers/intern/MOD_screw.cc
@@ -6,11 +6,10 @@
  */
 
 /* Screw modifier: revolves the edges about an axis */
-#include <limits.h>
+#include <climits>
 
 #include "BLI_utildefines.h"
 
-#include "BLI_alloca.h"
 #include "BLI_bitmap.h"
 #include "BLI_math.h"
 
@@ -53,7 +52,7 @@ static void initData(ModifierData *md)
 }
 
 /** Used for gathering edge connectivity. */
-typedef struct ScrewVertConnect {
+struct ScrewVertConnect {
   /** Distance from the center axis. */
   float dist_sq;
   /** Location relative to the transformed axis. */
@@ -63,14 +62,14 @@ typedef struct ScrewVertConnect {
   /** Edges on either side, a bit of a waste since each edge ref's 2 edges. */
   MEdge *e[2];
   char flag;
-} ScrewVertConnect;
+};
 
-typedef struct ScrewVertIter {
+struct ScrewVertIter {
   ScrewVertConnect *v_array;
   ScrewVertConnect *v_poin;
   uint v, v_other;
   MEdge *e;
-} ScrewVertIter;
+};
 
 #define SV_UNUSED (UINT_MAX)
 #define SV_INVALID ((UINT_MAX)-1)
@@ -337,9 +336,9 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
   }
 
   /* apply the multiplier */
-  angle *= (float)ltmd->iter;
-  screw_ofs *= (float)ltmd->iter;
-  uv_u_scale = 1.0f / (float)(step_tot);
+  angle *= float(ltmd->iter);
+  screw_ofs *= float(ltmd->iter);
+  uv_u_scale = 1.0f / float(step_tot);
 
   /* multiplying the steps is a bit tricky, this works best */
   step_tot = ((step_tot + 1) * ltmd->iter) - (ltmd->iter - 1);