Cleanup: reduce variable scopes

1 files changed, 13 insertions, 21 deletions

diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c
index 74a8a4268fc..f7cf4faf7cb 100644
--- a/source/blender/blenkernel/intern/deform.c
+++ b/source/blender/blenkernel/intern/deform.c
@@ -200,9 +200,8 @@ void BKE_defvert_copy_index(MDeformVert *dvert_dst,
 void BKE_defvert_sync(MDeformVert *dvert_dst, const MDeformVert *dvert_src, const bool use_ensure)
 {
   if (dvert_src->totweight && dvert_dst->totweight) {
-    int i;
-    MDeformWeight *dw_src;
-    for (i = 0, dw_src = dvert_src->dw; i < dvert_src->totweight; i++, dw_src++) {
+    MDeformWeight *dw_src = dvert_src->dw;
+    for (int i = 0; i < dvert_src->totweight; i++, dw_src++) {
       MDeformWeight *dw_dst;
       if (use_ensure) {
         dw_dst = BKE_defvert_ensure_index(dvert_dst, dw_src->def_nr);
@@ -228,9 +227,8 @@ void BKE_defvert_sync_mapped(MDeformVert *dvert_dst,
                              const bool use_ensure)
 {
   if (dvert_src->totweight && dvert_dst->totweight) {
-    int i;
-    MDeformWeight *dw_src;
-    for (i = 0, dw_src = dvert_src->dw; i < dvert_src->totweight; i++, dw_src++) {
+    MDeformWeight *dw_src = dvert_src->dw;
+    for (int i = 0; i < dvert_src->totweight; i++, dw_src++) {
       if (dw_src->def_nr < flip_map_len) {
         MDeformWeight *dw_dst;
         if (use_ensure) {
@@ -254,8 +252,7 @@ void BKE_defvert_sync_mapped(MDeformVert *dvert_dst,
 void BKE_defvert_remap(MDeformVert *dvert, const int *map, const int map_len)
 {
   MDeformWeight *dw = dvert->dw;
-  unsigned int i;
-  for (i = dvert->totweight; i != 0; i--, dw++) {
+  for (int i = dvert->totweight; i != 0; i--, dw++) {
     if (dw->def_nr < map_len) {
       BLI_assert(map[dw->def_nr] >= 0);
 
@@ -281,11 +278,9 @@ void BKE_defvert_normalize_subset(MDeformVert *dvert,
     }
   }
   else {
-    MDeformWeight *dw;
-    unsigned int i;
+    MDeformWeight *dw = dvert->dw;
     float tot_weight = 0.0f;
-
-    for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
+    for (int i = dvert->totweight; i != 0; i--, dw++) {
       if ((dw->def_nr < vgroup_tot) && vgroup_subset[dw->def_nr]) {
         tot_weight += dw->weight;
       }
@@ -293,7 +288,8 @@ void BKE_defvert_normalize_subset(MDeformVert *dvert,
 
     if (tot_weight > 0.0f) {
       float scalar = 1.0f / tot_weight;
-      for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
+      dw = dvert->dw;
+      for (int i = dvert->totweight; i != 0; i--, dw++) {
         if ((dw->def_nr < vgroup_tot) && vgroup_subset[dw->def_nr]) {
           dw->weight *= scalar;
 
@@ -822,8 +818,7 @@ int BKE_defvert_find_shared(const MDeformVert *dvert_a, const MDeformVert *dvert
 bool BKE_defvert_is_weight_zero(const struct MDeformVert *dvert, const int defgroup_tot)
 {
   MDeformWeight *dw = dvert->dw;
-  unsigned int i;
-  for (i = dvert->totweight; i != 0; i--, dw++) {
+  for (int i = dvert->totweight; i != 0; i--, dw++) {
     if (dw->weight != 0.0f) {
       /* check the group is in-range, happens on rare situations */
       if (LIKELY(dw->def_nr < defgroup_tot)) {
@@ -841,7 +836,6 @@ float BKE_defvert_total_selected_weight(const struct MDeformVert *dv,
                                         int defbase_tot,
                                         const bool *defbase_sel)
 {
-  int i;
   float total = 0.0f;
   const MDeformWeight *dw = dv->dw;
 
@@ -849,7 +843,7 @@ float BKE_defvert_total_selected_weight(const struct MDeformVert *dv,
     return total;
   }
 
-  for (i = dv->totweight; i != 0; i--, dw++) {
+  for (int i = dv->totweight; i != 0; i--, dw++) {
     if (dw->def_nr < defbase_tot) {
       if (defbase_sel[dw->def_nr]) {
         total += dw->weight;
@@ -947,7 +941,6 @@ float BKE_defvert_lock_relative_weight(float weight,
 void BKE_defvert_array_copy(MDeformVert *dst, const MDeformVert *src, int totvert)
 {
   /* Assumes dst is already set up */
-  int i;
 
   if (!src || !dst) {
     return;
@@ -955,7 +948,7 @@ void BKE_defvert_array_copy(MDeformVert *dst, const MDeformVert *src, int totver
 
   memcpy(dst, src, totvert * sizeof(MDeformVert));
 
-  for (i = 0; i < totvert; i++) {
+  for (int i = 0; i < totvert; i++) {
     if (src[i].dw) {
       dst[i].dw = MEM_mallocN(sizeof(MDeformWeight) * src[i].totweight, "copy_deformWeight");
       memcpy(dst[i].dw, src[i].dw, sizeof(MDeformWeight) * src[i].totweight);
@@ -968,14 +961,13 @@ void BKE_defvert_array_free_elems(MDeformVert *dvert, int totvert)
   /* Instead of freeing the verts directly,
    * call this function to delete any special
    * vert data */
-  int i;
 
   if (!dvert) {
     return;
   }
 
   /* Free any special data from the verts */
-  for (i = 0; i < totvert; i++) {
+  for (int i = 0; i < totvert; i++) {
     if (dvert[i].dw) {
       MEM_freeN(dvert[i].dw);
     }