Cleanup: reduce variable scope

4 files changed, 8 insertions, 10 deletions

diff --git a/source/blender/bmesh/intern/bmesh_delete.c b/source/blender/bmesh/intern/bmesh_delete.c
index e2436e53099..8ec7dc410d0 100644
--- a/source/blender/bmesh/intern/bmesh_delete.c
+++ b/source/blender/bmesh/intern/bmesh_delete.c
@@ -86,7 +86,6 @@ void BMO_mesh_delete_oflag_tagged(BMesh *bm, const short oflag, const char htype
 void BMO_mesh_delete_oflag_context(BMesh *bm, const short oflag, const int type)
 {
   BMEdge *e;
-  BMFace *f;
 
   BMIter eiter;
   BMIter fiter;
@@ -128,6 +127,7 @@ void BMO_mesh_delete_oflag_context(BMesh *bm, const short oflag, const int type)
     case DEL_FACES:
     case DEL_FACES_KEEP_BOUNDARY: {
       /* go through and mark all edges and all verts of all faces for delete */
+      BMFace *f;
       BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) {
         if (BMO_face_flag_test(bm, f, oflag)) {
           BMLoop *l_first = BM_FACE_FIRST_LOOP(f);
@@ -257,8 +257,6 @@ void BM_mesh_delete_hflag_tagged(BMesh *bm, const char hflag, const char htype)
 
 void BM_mesh_delete_hflag_context(BMesh *bm, const char hflag, const int type)
 {
-  BMEdge *e;
-  BMFace *f;
 
   BMIter eiter;
   BMIter fiter;
@@ -271,6 +269,7 @@ void BM_mesh_delete_hflag_context(BMesh *bm, const char hflag, const int type)
     }
     case DEL_EDGES: {
       /* flush down to vert */
+      BMEdge *e;
       BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
         if (BM_elem_flag_test(e, hflag)) {
           BM_elem_flag_enable(e->v1, hflag);
@@ -299,6 +298,8 @@ void BM_mesh_delete_hflag_context(BMesh *bm, const char hflag, const int type)
     }
     case DEL_FACES: {
       /* go through and mark all edges and all verts of all faces for delete */
+      BMFace *f;
+      BMEdge *e;
       BM_ITER_MESH (f, &fiter, bm, BM_FACES_OF_MESH) {
         if (BM_elem_flag_test(f, hflag)) {
           BMLoop *l_first = BM_FACE_FIRST_LOOP(f);
diff --git a/source/blender/bmesh/intern/bmesh_structure.c b/source/blender/bmesh/intern/bmesh_structure.c
index 6baaeb43f1a..7d340f02f2e 100644
--- a/source/blender/bmesh/intern/bmesh_structure.c
+++ b/source/blender/bmesh/intern/bmesh_structure.c
@@ -182,9 +182,8 @@ void bmesh_disk_edge_remove(BMEdge *e, BMVert *v)
 
 BMEdge *bmesh_disk_edge_exists(const BMVert *v1, const BMVert *v2)
 {
-  BMEdge *e_iter, *e_first;
-
   if (v1->e) {
+    BMEdge *e_iter, *e_first;
     e_first = e_iter = v1->e;
 
     do {
diff --git a/source/blender/bmesh/operators/bmo_connect_nonplanar.c b/source/blender/bmesh/operators/bmo_connect_nonplanar.c
index ac88ffb9065..8112844fc8a 100644
--- a/source/blender/bmesh/operators/bmo_connect_nonplanar.c
+++ b/source/blender/bmesh/operators/bmo_connect_nonplanar.c
@@ -24,7 +24,7 @@
 static float bm_face_subset_calc_planar(BMLoop *l_first, BMLoop *l_last, const float no[3])
 {
   float axis_mat[3][3];
-  float z_prev, z_curr;
+  float z_prev;
   float delta_z = 0.0f;
 
   /* Newell's Method */
@@ -35,7 +35,7 @@ static float bm_face_subset_calc_planar(BMLoop *l_first, BMLoop *l_last, const f
 
   z_prev = dot_m3_v3_row_z(axis_mat, l_last->v->co);
   do {
-    z_curr = dot_m3_v3_row_z(axis_mat, l_iter->v->co);
+    const float z_curr = dot_m3_v3_row_z(axis_mat, l_iter->v->co);
     delta_z += fabsf(z_curr - z_prev);
     z_prev = z_curr;
   } while ((l_iter = l_iter->next) != l_term);
diff --git a/source/blender/bmesh/operators/bmo_poke.c b/source/blender/bmesh/operators/bmo_poke.c
index 05f13a161b1..6622dbf7575 100644
--- a/source/blender/bmesh/operators/bmo_poke.c
+++ b/source/blender/bmesh/operators/bmo_poke.c
@@ -52,7 +52,6 @@ void bmo_poke_exec(BMesh *bm, BMOperator *op)
   }
 
   BMO_ITER (f, &oiter, op->slots_in, "faces", BM_FACE) {
-    BMFace *f_new;
     float f_center[3];
     BMVert *v_center = NULL;
     BMLoop *l_iter, *l_first;
@@ -83,8 +82,7 @@ void bmo_poke_exec(BMesh *bm, BMOperator *op)
     l_iter = l_first = BM_FACE_FIRST_LOOP(f);
     do {
       BMLoop *l_new;
-
-      f_new = BM_face_create_quad_tri(
+      BMFace *f_new = BM_face_create_quad_tri(
           bm, l_iter->v, l_iter->next->v, v_center, NULL, f, BM_CREATE_NOP);
       l_new = BM_FACE_FIRST_LOOP(f_new);