Cleanup: Modifiers, Clang-Tidy else-after-return fixes

This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/modifiers` module.

No functional changes.

17 files changed, 93 insertions, 110 deletions

diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index 48d69f8e02c..1c98cec915e 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -139,12 +139,11 @@ static int svert_sum_cmp(const void *e1, const void *e2)
   if (sv1->sum_co > sv2->sum_co) {
     return 1;
   }
-  else if (sv1->sum_co < sv2->sum_co) {
+  if (sv1->sum_co < sv2->sum_co) {
     return -1;
   }
-  else {
-    return 0;
-  }
+
+  return 0;
 }
 
 static void svert_from_mvert(SortVertsElem *sv,
@@ -826,10 +825,10 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
   if (amd->curve_ob && amd->curve_ob->type != OB_CURVE) {
     return true;
   }
-  else if (amd->start_cap && amd->start_cap->type != OB_MESH) {
+  if (amd->start_cap && amd->start_cap->type != OB_MESH) {
     return true;
   }
-  else if (amd->end_cap && amd->end_cap->type != OB_MESH) {
+  if (amd->end_cap && amd->end_cap->type != OB_MESH) {
     return true;
   }
 
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index 9b9dd0a079c..191623112bb 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -103,9 +103,8 @@ static bool dependsOnTime(ModifierData *md)
   if (dmd->texture) {
     return BKE_texture_dependsOnTime(dmd->texture);
   }
-  else {
-    return false;
-  }
+
+  return false;
 }
 
 static bool dependsOnNormals(ModifierData *md)
diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c
index 4e46e135b72..d520cccf0a2 100644
--- a/source/blender/modifiers/intern/MOD_explode.c
+++ b/source/blender/modifiers/intern/MOD_explode.c
@@ -1180,9 +1180,8 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
       BKE_id_free(NULL, split_m);
       return explode;
     }
-    else {
-      return explodeMesh(emd, psmd, ctx, scene, mesh);
-    }
+
+    return explodeMesh(emd, psmd, ctx, scene, mesh);
   }
   return mesh;
 }
diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c
index 746f9e56c06..86592245368 100644
--- a/source/blender/modifiers/intern/MOD_hook.c
+++ b/source/blender/modifiers/intern/MOD_hook.c
@@ -185,7 +185,7 @@ static float hook_falloff(const struct HookData_cb *hd, const float len_sq)
   if (len_sq > hd->falloff_sq) {
     return 0.0f;
   }
-  else if (len_sq > 0.0f) {
+  if (len_sq > 0.0f) {
     float fac;
 
     if (hd->falloff_type == eHook_Falloff_Const) {
diff --git a/source/blender/modifiers/intern/MOD_meshcache_mdd.c b/source/blender/modifiers/intern/MOD_meshcache_mdd.c
index 60376f61708..6787ef5b47e 100644
--- a/source/blender/modifiers/intern/MOD_meshcache_mdd.c
+++ b/source/blender/modifiers/intern/MOD_meshcache_mdd.c
@@ -238,22 +238,19 @@ bool MOD_meshcache_read_mdd_frame(FILE *fp,
         MOD_meshcache_read_mdd_index(fp, vertexCos, verts_tot, index_range[0], 1.0f, err_str)) {
       return true;
     }
-    else {
-      return false;
-    }
+
+    return false;
   }
-  else {
-    /* read both and interpolate */
-    if ((BLI_fseek(fp, 0, SEEK_SET) == 0) &&
-        MOD_meshcache_read_mdd_index(fp, vertexCos, verts_tot, index_range[0], 1.0f, err_str) &&
-        (BLI_fseek(fp, 0, SEEK_SET) == 0) &&
-        MOD_meshcache_read_mdd_index(fp, vertexCos, verts_tot, index_range[1], factor, err_str)) {
-      return true;
-    }
-    else {
-      return false;
-    }
+
+  /* read both and interpolate */
+  if ((BLI_fseek(fp, 0, SEEK_SET) == 0) &&
+      MOD_meshcache_read_mdd_index(fp, vertexCos, verts_tot, index_range[0], 1.0f, err_str) &&
+      (BLI_fseek(fp, 0, SEEK_SET) == 0) &&
+      MOD_meshcache_read_mdd_index(fp, vertexCos, verts_tot, index_range[1], factor, err_str)) {
+    return true;
   }
+
+  return false;
 }
 
 bool MOD_meshcache_read_mdd_times(const char *filepath,
diff --git a/source/blender/modifiers/intern/MOD_meshcache_pc2.c b/source/blender/modifiers/intern/MOD_meshcache_pc2.c
index 60011458c67..1ea71730db7 100644
--- a/source/blender/modifiers/intern/MOD_meshcache_pc2.c
+++ b/source/blender/modifiers/intern/MOD_meshcache_pc2.c
@@ -213,22 +213,19 @@ bool MOD_meshcache_read_pc2_frame(FILE *fp,
         MOD_meshcache_read_pc2_index(fp, vertexCos, verts_tot, index_range[0], 1.0f, err_str)) {
       return true;
     }
-    else {
-      return false;
-    }
+
+    return false;
   }
-  else {
-    /* read both and interpolate */
-    if ((BLI_fseek(fp, 0, SEEK_SET) == 0) &&
-        MOD_meshcache_read_pc2_index(fp, vertexCos, verts_tot, index_range[0], 1.0f, err_str) &&
-        (BLI_fseek(fp, 0, SEEK_SET) == 0) &&
-        MOD_meshcache_read_pc2_index(fp, vertexCos, verts_tot, index_range[1], factor, err_str)) {
-      return true;
-    }
-    else {
-      return false;
-    }
+
+  /* read both and interpolate */
+  if ((BLI_fseek(fp, 0, SEEK_SET) == 0) &&
+      MOD_meshcache_read_pc2_index(fp, vertexCos, verts_tot, index_range[0], 1.0f, err_str) &&
+      (BLI_fseek(fp, 0, SEEK_SET) == 0) &&
+      MOD_meshcache_read_pc2_index(fp, vertexCos, verts_tot, index_range[1], factor, err_str)) {
+    return true;
   }
+
+  return false;
 }
 
 bool MOD_meshcache_read_pc2_times(const char *filepath,
diff --git a/source/blender/modifiers/intern/MOD_normal_edit.c b/source/blender/modifiers/intern/MOD_normal_edit.c
index 7039b24cfc6..66ab6b9e4db 100644
--- a/source/blender/modifiers/intern/MOD_normal_edit.c
+++ b/source/blender/modifiers/intern/MOD_normal_edit.c
@@ -472,7 +472,7 @@ static bool is_valid_target(NormalEditModifierData *enmd)
   if (enmd->mode == MOD_NORMALEDIT_MODE_RADIAL) {
     return true;
   }
-  else if ((enmd->mode == MOD_NORMALEDIT_MODE_DIRECTIONAL) && enmd->target) {
+  if ((enmd->mode == MOD_NORMALEDIT_MODE_DIRECTIONAL) && enmd->target) {
     return true;
   }
   BKE_modifier_set_error((ModifierData *)enmd, "Invalid target settings");
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c
index dd881f1ac74..bdb1851906b 100644
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@@ -198,12 +198,11 @@ static bool particle_skip(ParticleInstanceModifierData *pimd, ParticleSystem *ps
   if (maxp > minp) {
     return randp < minp || randp >= maxp;
   }
-  else if (maxp < minp) {
+  if (maxp < minp) {
     return randp < minp && randp >= maxp;
   }
-  else {
-    return true;
-  }
+
+  return true;
 
   return false;
 }
diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c
index a5f6be04a08..c40fbffc506 100644
--- a/source/blender/modifiers/intern/MOD_shrinkwrap.c
+++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c
@@ -96,7 +96,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene),
   if (!smd->target || smd->target->type != OB_MESH) {
     return true;
   }
-  else if (smd->auxTarget && smd->auxTarget->type != OB_MESH) {
+  if (smd->auxTarget && smd->auxTarget->type != OB_MESH) {
     return true;
   }
   return false;
diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c
index 8f0174fe6d9..3221acce1ba 100644
--- a/source/blender/modifiers/intern/MOD_skin.c
+++ b/source/blender/modifiers/intern/MOD_skin.c
@@ -222,9 +222,8 @@ static bool skin_frame_find_contained_faces(const Frame *frame, BMFace *fill_fac
   if (diag) {
     return BM_edge_face_pair(diag, &fill_faces[0], &fill_faces[1]);
   }
-  else {
-    return false;
-  }
+
+  return false;
 }
 
 /* Returns true if hull is successfully built, false otherwise */
@@ -814,9 +813,8 @@ static int calc_edge_subdivisions(const MVert *mvert,
     if (v1_branch && v2_branch) {
       return 2;
     }
-    else {
-      return 0;
-    }
+
+    return 0;
   }
 
   avg_radius = half_v2(evs[0]->radius) + half_v2(evs[1]->radius);
diff --git a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
index 423a6b4458a..3c1d8a493ce 100644
--- a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
+++ b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
@@ -479,12 +479,12 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md,
                     old_edge_vert_ref->edges_len++;
                     break;
                   }
-                  else if (vm[orig_medge[edge].v1] == vs[1 - j]) {
+                  if (vm[orig_medge[edge].v1] == vs[1 - j]) {
                     invalid_edge_index = edge + 1;
                     invalid_edge_reversed = (j == 0);
                     break;
                   }
-                  else if (vm[orig_medge[edge].v2] == vs[1 - j]) {
+                  if (vm[orig_medge[edge].v2] == vs[1 - j]) {
                     invalid_edge_index = edge + 1;
                     invalid_edge_reversed = (j == 1);
                     break;
@@ -936,7 +936,7 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md,
                     }
                     break;
                   }
-                  else if (edge->faces[0] == eg_track_faces[0]) {
+                  if (edge->faces[0] == eg_track_faces[0]) {
                     insert_at_start = true;
                     eg_track_faces[0] = edge->faces[1];
                     found_edge = edge;
@@ -945,14 +945,14 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md,
                     }
                     break;
                   }
-                  else if (edge->faces[1] != NULL) {
+                  if (edge->faces[1] != NULL) {
                     if (edge->faces[1] == eg_track_faces[1]) {
                       insert_at_start = false;
                       eg_track_faces[1] = edge->faces[0];
                       found_edge = edge;
                       break;
                     }
-                    else if (edge->faces[1] == eg_track_faces[0]) {
+                    if (edge->faces[1] == eg_track_faces[0]) {
                       insert_at_start = true;
                       eg_track_faces[0] = edge->faces[0];
                       found_edge = edge;
diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c
index 6a0e82a686b..c69d78f112f 100644
--- a/source/blender/modifiers/intern/MOD_surfacedeform.c
+++ b/source/blender/modifiers/intern/MOD_surfacedeform.c
@@ -372,9 +372,8 @@ BLI_INLINE uint nearestVert(SDefBindCalcData *const data, const float point_co[3
       len_squared_v3v3(point_co, data->targetCos[edge->v2])) {
     return edge->v1;
   }
-  else {
-    return edge->v2;
-  }
+
+  return edge->v2;
 }
 
 BLI_INLINE int isPolyValid(const float coords[][2], const uint nr)
@@ -1283,7 +1282,7 @@ static void surfacedeformModifier_do(ModifierData *md,
     BKE_modifier_set_error(md, "Vertices changed from %u to %u", smd->numverts, numverts);
     return;
   }
-  else if (smd->numpoly != tnumpoly) {
+  if (smd->numpoly != tnumpoly) {
     BKE_modifier_set_error(md, "Target polygons changed from %u to %u", smd->numpoly, tnumpoly);
     return;
   }
diff --git a/source/blender/modifiers/intern/MOD_ui_common.c b/source/blender/modifiers/intern/MOD_ui_common.c
index 01b9e972086..8de4b042eb3 100644
--- a/source/blender/modifiers/intern/MOD_ui_common.c
+++ b/source/blender/modifiers/intern/MOD_ui_common.c
@@ -179,12 +179,11 @@ static int modifier_is_simulation(ModifierData *md)
     return 1;
   }
   /* Particle Tab */
-  else if (md->type == eModifierType_ParticleSystem) {
+  if (md->type == eModifierType_ParticleSystem) {
     return 2;
   }
-  else {
-    return 0;
-  }
+
+  return 0;
 }
 
 static bool modifier_can_delete(ModifierData *md)
diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c
index c6dff375109..179996d5acf 100644
--- a/source/blender/modifiers/intern/MOD_util.c
+++ b/source/blender/modifiers/intern/MOD_util.c
@@ -143,10 +143,9 @@ void MOD_get_texture_coords(MappingInfoModifierData *dmd,
       MEM_freeN(done);
       return;
     }
-    else {
-      /* if there are no UVs, default to local */
-      texmapping = MOD_DISP_MAP_LOCAL;
-    }
+
+    /* if there are no UVs, default to local */
+    texmapping = MOD_DISP_MAP_LOCAL;
   }
 
   MVert *mv = mesh->mvert;
diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c
index 2657e3d894a..45252fed031 100644
--- a/source/blender/modifiers/intern/MOD_warp.c
+++ b/source/blender/modifiers/intern/MOD_warp.c
@@ -123,9 +123,8 @@ static bool dependsOnTime(ModifierData *md)
   if (wmd->texture) {
     return BKE_texture_dependsOnTime(wmd->texture);
   }
-  else {
-    return false;
-  }
+
+  return false;
 }
 
 static void freeData(ModifierData *md)
diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c
index d1c618df68b..02baaa7b830 100644
--- a/source/blender/modifiers/intern/MOD_weightvgmix.c
+++ b/source/blender/modifiers/intern/MOD_weightvgmix.c
@@ -95,16 +95,16 @@ static float mix_weight(float weight, float weight2, char mix_mode)
   if (mix_mode == MOD_WVG_MIX_SET) {
     return weight2;
   }
-  else if (mix_mode == MOD_WVG_MIX_ADD) {
+  if (mix_mode == MOD_WVG_MIX_ADD) {
     return (weight + weight2);
   }
-  else if (mix_mode == MOD_WVG_MIX_SUB) {
+  if (mix_mode == MOD_WVG_MIX_SUB) {
     return (weight - weight2);
   }
-  else if (mix_mode == MOD_WVG_MIX_MUL) {
+  if (mix_mode == MOD_WVG_MIX_MUL) {
     return (weight * weight2);
   }
-  else if (mix_mode == MOD_WVG_MIX_DIV) {
+  if (mix_mode == MOD_WVG_MIX_DIV) {
     /* Avoid dividing by zero (or really small values). */
     if (weight2 < 0.0f && weight2 > -MOD_WVG_ZEROFLOOR) {
       weight2 = -MOD_WVG_ZEROFLOOR;
@@ -114,7 +114,7 @@ static float mix_weight(float weight, float weight2, char mix_mode)
     }
     return (weight / weight2);
   }
-  else if (mix_mode == MOD_WVG_MIX_DIF) {
+  if (mix_mode == MOD_WVG_MIX_DIF) {
     return (weight < weight2 ? weight2 - weight : weight - weight2);
   }
   else if (mix_mode == MOD_WVG_MIX_AVG) {
diff --git a/source/blender/modifiers/intern/MOD_weld.c b/source/blender/modifiers/intern/MOD_weld.c
index cf92da1b0e6..a89209f5dbb 100644
--- a/source/blender/modifiers/intern/MOD_weld.c
+++ b/source/blender/modifiers/intern/MOD_weld.c
@@ -1850,23 +1850,22 @@ static Mesh *weldModifier_doWeld(WeldModifierData *wmd, const ModifierEvalContex
                 &iter, wp, weld_mesh.wloop, mloop, weld_mesh.loop_map, group_buffer)) {
           continue;
         }
-        else {
-          if (wp->poly_dst != OUT_OF_CONTEXT) {
-            continue;
-          }
-          while (weld_iter_loop_of_poly_next(&iter)) {
-            customdata_weld(&mesh->ldata, &result->ldata, group_buffer, iter.group_len, loop_cur);
-            uint v = vert_final[iter.v];
-            uint e = edge_final[iter.e];
-            r_ml->v = v;
-            r_ml->e = e;
-            r_ml++;
-            loop_cur++;
-            if (iter.type) {
-              result->medge[e].flag &= ~ME_LOOSEEDGE;
-            }
-            BLI_assert((result->medge[e].flag & ME_LOOSEEDGE) == 0);
+
+        if (wp->poly_dst != OUT_OF_CONTEXT) {
+          continue;
+        }
+        while (weld_iter_loop_of_poly_next(&iter)) {
+          customdata_weld(&mesh->ldata, &result->ldata, group_buffer, iter.group_len, loop_cur);
+          uint v = vert_final[iter.v];
+          uint e = edge_final[iter.e];
+          r_ml->v = v;
+          r_ml->e = e;
+          r_ml++;
+          loop_cur++;
+          if (iter.type) {
+            result->medge[e].flag &= ~ME_LOOSEEDGE;
           }
+          BLI_assert((result->medge[e].flag & ME_LOOSEEDGE) == 0);
         }
       }
 
@@ -1885,24 +1884,24 @@ static Mesh *weldModifier_doWeld(WeldModifierData *wmd, const ModifierEvalContex
               &iter, wp, weld_mesh.wloop, mloop, weld_mesh.loop_map, group_buffer)) {
         continue;
       }
-      else {
-        if (wp->poly_dst != OUT_OF_CONTEXT) {
-          continue;
-        }
-        while (weld_iter_loop_of_poly_next(&iter)) {
-          customdata_weld(&mesh->ldata, &result->ldata, group_buffer, iter.group_len, loop_cur);
-          uint v = vert_final[iter.v];
-          uint e = edge_final[iter.e];
-          r_ml->v = v;
-          r_ml->e = e;
-          r_ml++;
-          loop_cur++;
-          if (iter.type) {
-            result->medge[e].flag &= ~ME_LOOSEEDGE;
-          }
-          BLI_assert((result->medge[e].flag & ME_LOOSEEDGE) == 0);
+
+      if (wp->poly_dst != OUT_OF_CONTEXT) {
+        continue;
+      }
+      while (weld_iter_loop_of_poly_next(&iter)) {
+        customdata_weld(&mesh->ldata, &result->ldata, group_buffer, iter.group_len, loop_cur);
+        uint v = vert_final[iter.v];
+        uint e = edge_final[iter.e];
+        r_ml->v = v;
+        r_ml->e = e;
+        r_ml++;
+        loop_cur++;
+        if (iter.type) {
+          result->medge[e].flag &= ~ME_LOOSEEDGE;
         }
+        BLI_assert((result->medge[e].flag & ME_LOOSEEDGE) == 0);
       }
+
       r_mp->loopstart = loop_start;
       r_mp->totloop = loop_cur - loop_start;
       r_mp++;