Cleanup: Draw, Clang-Tidy else-after-return fixes (incomplete)

This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/draw` module. Not all warnings are addressed
in this commit.

No functional changes.

10 files changed, 87 insertions, 99 deletions

diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c
index 19325729114..38f5536170e 100644
--- a/source/blender/draw/engines/eevee/eevee_lightcache.c
+++ b/source/blender/draw/engines/eevee/eevee_lightcache.c
@@ -1021,9 +1021,8 @@ static void compute_cell_id(EEVEE_LightGrid *egrid,
           if (visited_cells == cell_idx) {
             return;
           }
-          else {
-            visited_cells++;
-          }
+
+          visited_cells++;
         }
       }
     }
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 59e8c1407e6..4f97fe99b27 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -483,9 +483,8 @@ static EeveeMaterialCache material_opaque(EEVEE_Data *vedata,
   if (BLI_ghash_ensure_p(pd->material_hash, key, (void ***)&emc_p)) {
     return **emc_p;
   }
-  else {
-    *emc_p = emc = BLI_memblock_alloc(sldata->material_cache);
-  }
+
+  *emc_p = emc = BLI_memblock_alloc(sldata->material_cache);
 
   material_shadow(vedata, sldata, ma, is_hair, emc);
 
diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c
index 0b79c8016d1..4e49136a6bc 100644
--- a/source/blender/draw/engines/eevee/eevee_motion_blur.c
+++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c
@@ -480,16 +480,15 @@ void EEVEE_motion_blur_cache_finish(EEVEE_Data *vedata)
                 GPU_VERTBUF_DISCARD_SAFE(mb_geom->vbo[MB_NEXT]);
                 break;
               }
+
+              /* Modify the batch to include the previous & next position. */
+              if (i == MB_PREV) {
+                GPU_batch_vertbuf_add_ex(batch, vbo, true);
+                mb_geom->vbo[i] = NULL;
+              }
               else {
-                /* Modify the batch to include the previous & next position. */
-                if (i == MB_PREV) {
-                  GPU_batch_vertbuf_add_ex(batch, vbo, true);
-                  mb_geom->vbo[i] = NULL;
-                }
-                else {
-                  /* This VBO can be reuse by next time step. Don't pass ownership. */
-                  GPU_batch_vertbuf_add_ex(batch, vbo, false);
-                }
+                /* This VBO can be reuse by next time step. Don't pass ownership. */
+                GPU_batch_vertbuf_add_ex(batch, vbo, false);
               }
             }
           }
diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
index 8a4134ec8ea..41a7196cb90 100644
--- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
@@ -132,12 +132,11 @@ static int gpencil_tobject_dist_sort(const void *a, const void *b)
   if (ob_a->camera_z > ob_b->camera_z) {
     return 1;
   }
-  else if (ob_a->camera_z < ob_b->camera_z) {
+  if (ob_a->camera_z < ob_b->camera_z) {
     return -1;
   }
-  else {
-    return 0;
-  }
+
+  return 0;
 }
 
 void gpencil_object_cache_sort(GPENCIL_PrivateData *pd)
@@ -193,7 +192,7 @@ static float gpencil_layer_final_opacity_get(const GPENCIL_PrivateData *pd,
     if (is_obact && is_fade) {
       return gpl->opacity * pd->fade_layer_opacity;
     }
-    else if (!is_obact && (pd->fade_gp_object_opacity > -1.0f)) {
+    if (!is_obact && (pd->fade_gp_object_opacity > -1.0f)) {
       return gpl->opacity * pd->fade_gp_object_opacity;
     }
   }
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_data.c b/source/blender/draw/engines/gpencil/gpencil_draw_data.c
index ed443b2c73f..51152475a06 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_data.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_data.c
@@ -359,12 +359,11 @@ static float light_power_get(const Light *la)
   if (la->type == LA_AREA) {
     return 1.0f / (4.0f * M_PI);
   }
-  else if (la->type == LA_SPOT || la->type == LA_LOCAL) {
+  if (la->type == LA_SPOT || la->type == LA_LOCAL) {
     return 1.0f / (4.0f * M_PI * M_PI);
   }
-  else {
-    return 1.0f / M_PI;
-  }
+
+  return 1.0f / M_PI;
 }
 
 void gpencil_light_pool_populate(GPENCIL_LightPool *lightpool, Object *ob)
diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c
index 960e5e424f2..1a3bfb9934c 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.c
+++ b/source/blender/draw/engines/overlay/overlay_armature.c
@@ -924,12 +924,11 @@ static float get_bone_wire_thickness(const ArmatureDrawContext *ctx, int bonefla
   if (ctx->const_color) {
     return ctx->const_wire;
   }
-  else if (boneflag & (BONE_DRAW_ACTIVE | BONE_SELECTED)) {
+  if (boneflag & (BONE_DRAW_ACTIVE | BONE_SELECTED)) {
     return 2.0f;
   }
-  else {
-    return 1.0f;
-  }
+
+  return 1.0f;
 }
 
 static const float *get_bone_wire_color(const ArmatureDrawContext *ctx,
@@ -2219,13 +2218,13 @@ static bool POSE_is_driven_by_active_armature(Object *ob)
     }
     return is_active;
   }
-  else {
-    Object *ob_mesh_deform = BKE_modifiers_is_deformed_by_meshdeform(ob);
-    if (ob_mesh_deform) {
-      /* Recursive. */
-      return POSE_is_driven_by_active_armature(ob_mesh_deform);
-    }
+
+  Object *ob_mesh_deform = BKE_modifiers_is_deformed_by_meshdeform(ob);
+  if (ob_mesh_deform) {
+    /* Recursive. */
+    return POSE_is_driven_by_active_armature(ob_mesh_deform);
   }
+
   return false;
 }
 
diff --git a/source/blender/draw/engines/overlay/overlay_extra.c b/source/blender/draw/engines/overlay/overlay_extra.c
index 60e622ca706..c7c4e2b1a3a 100644
--- a/source/blender/draw/engines/overlay/overlay_extra.c
+++ b/source/blender/draw/engines/overlay/overlay_extra.c
@@ -1018,9 +1018,8 @@ static float camera_offaxis_shiftx_get(Scene *scene,
     const float width = instdata->corner_x * 2.0f;
     return delta_shiftx * width;
   }
-  else {
-    return 0.0;
-  }
+
+  return 0.0;
 }
 /**
  * Draw the stereo 3d support elements (cameras, plane, volume).
diff --git a/source/blender/draw/engines/overlay/overlay_image.c b/source/blender/draw/engines/overlay/overlay_image.c
index d456e147c15..06d92f486d0 100644
--- a/source/blender/draw/engines/overlay/overlay_image.c
+++ b/source/blender/draw/engines/overlay/overlay_image.c
@@ -109,13 +109,12 @@ static eStereoViews camera_background_images_stereo_eye(const Scene *scene, cons
   if ((scene->r.scemode & R_MULTIVIEW) == 0) {
     return STEREO_LEFT_ID;
   }
-  else if (v3d->stereo3d_camera != STEREO_3D_ID) {
+  if (v3d->stereo3d_camera != STEREO_3D_ID) {
     /* show only left or right camera */
     return v3d->stereo3d_camera;
   }
-  else {
-    return v3d->multiview_eye;
-  }
+
+  return v3d->multiview_eye;
 }
 
 static void camera_background_images_stereo_setup(const Scene *scene,
@@ -162,9 +161,8 @@ static struct GPUTexture *image_camera_background_texture_get(CameraBGImage *bgp
         /* Frame is out of range, dont show. */
         return NULL;
       }
-      else {
-        camera_background_images_stereo_setup(scene, draw_ctx->v3d, image, iuser);
-      }
+
+      camera_background_images_stereo_setup(scene, draw_ctx->v3d, image, iuser);
 
       iuser->scene = draw_ctx->scene;
       ImBuf *ibuf = BKE_image_acquire_ibuf(image, iuser, &lock);
diff --git a/source/blender/draw/engines/overlay/overlay_paint.c b/source/blender/draw/engines/overlay/overlay_paint.c
index 25b8a953ba7..f0a1e77cf05 100644
--- a/source/blender/draw/engines/overlay/overlay_paint.c
+++ b/source/blender/draw/engines/overlay/overlay_paint.c
@@ -36,7 +36,7 @@ static bool paint_object_is_rendered_transparent(View3D *v3d, Object *ob)
   if (v3d->shading.type == OB_WIRE) {
     return true;
   }
-  else if (v3d->shading.type == OB_SOLID) {
+  if (v3d->shading.type == OB_SOLID) {
     if (v3d->shading.flag & V3D_SHADING_XRAY) {
       return true;
     }
@@ -44,8 +44,8 @@ static bool paint_object_is_rendered_transparent(View3D *v3d, Object *ob)
     if (ob && v3d->shading.color_type == V3D_SHADING_OBJECT_COLOR) {
       return ob->color[3] < 1.0f;
     }
-    else if (ob && ob->type == OB_MESH && ob->data &&
-             v3d->shading.color_type == V3D_SHADING_MATERIAL_COLOR) {
+    if (ob && ob->type == OB_MESH && ob->data &&
+        v3d->shading.color_type == V3D_SHADING_MATERIAL_COLOR) {
       Mesh *me = ob->data;
       for (int i = 0; i < me->totcol; i++) {
         Material *mat = me->mat[i];
diff --git a/source/blender/draw/engines/workbench/workbench_effect_antialiasing.c b/source/blender/draw/engines/workbench/workbench_effect_antialiasing.c
index 0e896c4b7bb..faf64b55c2d 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_antialiasing.c
+++ b/source/blender/draw/engines/workbench/workbench_effect_antialiasing.c
@@ -112,17 +112,15 @@ int workbench_antialiasing_sample_count_get(WORKBENCH_PrivateData *wpd)
     /* Only draw using SMAA or no AA when navigating. */
     return min_ii(wpd->preferences->viewport_aa, 1);
   }
-  else if (DRW_state_is_image_render()) {
+  if (DRW_state_is_image_render()) {
     if (draw_ctx->v3d) {
       return scene->display.viewport_aa;
     }
-    else {
-      return scene->display.render_aa;
-    }
-  }
-  else {
-    return wpd->preferences->viewport_aa;
+
+    return scene->display.render_aa;
   }
+
+  return wpd->preferences->viewport_aa;
 }
 
 void workbench_antialiasing_view_updated(WORKBENCH_Data *vedata)
@@ -361,53 +359,52 @@ bool workbench_antialiasing_setup(WORKBENCH_Data *vedata)
     /* TAA accumulation has finish. Just copy the result back */
     return false;
   }
-  else {
-    const float *viewport_size = DRW_viewport_size_get();
-    const DRWView *default_view = DRW_view_default_get();
-    float *transform_offset;
-
-    switch (wpd->taa_sample_len) {
-      default:
-      case 5:
-        transform_offset = e_data.jitter_5[min_ii(wpd->taa_sample, 5)];
-        break;
-      case 8:
-        transform_offset = e_data.jitter_8[min_ii(wpd->taa_sample, 8)];
-        break;
-      case 11:
-        transform_offset = e_data.jitter_11[min_ii(wpd->taa_sample, 11)];
-        break;
-      case 16:
-        transform_offset = e_data.jitter_16[min_ii(wpd->taa_sample, 16)];
-        break;
-      case 32:
-        transform_offset = e_data.jitter_32[min_ii(wpd->taa_sample, 32)];
-        break;
-    }
-
-    /* construct new matrices from transform delta */
-    float winmat[4][4], viewmat[4][4], persmat[4][4];
-    DRW_view_winmat_get(default_view, winmat, false);
-    DRW_view_viewmat_get(default_view, viewmat, false);
-    DRW_view_persmat_get(default_view, persmat, false);
 
-    window_translate_m4(winmat,
-                        persmat,
-                        transform_offset[0] / viewport_size[0],
-                        transform_offset[1] / viewport_size[1]);
-
-    if (wpd->view) {
-      /* When rendering just update the view. This avoids recomputing the culling. */
-      DRW_view_update_sub(wpd->view, viewmat, winmat);
-    }
-    else {
-      /* TAA is not making a big change to the matrices.
-       * Reuse the main view culling by creating a sub-view. */
-      wpd->view = DRW_view_create_sub(default_view, viewmat, winmat);
-    }
-    DRW_view_set_active(wpd->view);
-    return true;
+  const float *viewport_size = DRW_viewport_size_get();
+  const DRWView *default_view = DRW_view_default_get();
+  float *transform_offset;
+
+  switch (wpd->taa_sample_len) {
+    default:
+    case 5:
+      transform_offset = e_data.jitter_5[min_ii(wpd->taa_sample, 5)];
+      break;
+    case 8:
+      transform_offset = e_data.jitter_8[min_ii(wpd->taa_sample, 8)];
+      break;
+    case 11:
+      transform_offset = e_data.jitter_11[min_ii(wpd->taa_sample, 11)];
+      break;
+    case 16:
+      transform_offset = e_data.jitter_16[min_ii(wpd->taa_sample, 16)];
+      break;
+    case 32:
+      transform_offset = e_data.jitter_32[min_ii(wpd->taa_sample, 32)];
+      break;
+  }
+
+  /* construct new matrices from transform delta */
+  float winmat[4][4], viewmat[4][4], persmat[4][4];
+  DRW_view_winmat_get(default_view, winmat, false);
+  DRW_view_viewmat_get(default_view, viewmat, false);
+  DRW_view_persmat_get(default_view, persmat, false);
+
+  window_translate_m4(winmat,
+                      persmat,
+                      transform_offset[0] / viewport_size[0],
+                      transform_offset[1] / viewport_size[1]);
+
+  if (wpd->view) {
+    /* When rendering just update the view. This avoids recomputing the culling. */
+    DRW_view_update_sub(wpd->view, viewmat, winmat);
+  }
+  else {
+    /* TAA is not making a big change to the matrices.
+     * Reuse the main view culling by creating a sub-view. */
+    wpd->view = DRW_view_create_sub(default_view, viewmat, winmat);
   }
+  DRW_view_set_active(wpd->view);
+  return true;
 }
 
 void workbench_antialiasing_draw_pass(WORKBENCH_Data *vedata)