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

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

No functional changes.

1 files changed, 114 insertions, 127 deletions

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index e331e5ae1dd..4bd966cffc6 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -667,9 +667,8 @@ char BKE_image_alpha_mode_from_extension_ex(const char *filepath)
   if (BLI_path_extension_check_n(filepath, ".exr", ".cin", ".dpx", ".hdr", NULL)) {
     return IMA_ALPHA_PREMUL;
   }
-  else {
-    return IMA_ALPHA_STRAIGHT;
-  }
+
+  return IMA_ALPHA_STRAIGHT;
 }
 
 void BKE_image_alpha_mode_from_extension(Image *image)
@@ -1201,57 +1200,56 @@ int BKE_image_imtype_to_ftype(const char imtype, ImbFormatOptions *r_options)
   if (imtype == R_IMF_IMTYPE_TARGA) {
     return IMB_FTYPE_TGA;
   }
-  else if (imtype == R_IMF_IMTYPE_RAWTGA) {
+  if (imtype == R_IMF_IMTYPE_RAWTGA) {
     r_options->flag = RAWTGA;
     return IMB_FTYPE_TGA;
   }
-  else if (imtype == R_IMF_IMTYPE_IRIS) {
+  if (imtype == R_IMF_IMTYPE_IRIS) {
     return IMB_FTYPE_IMAGIC;
   }
 #ifdef WITH_HDR
-  else if (imtype == R_IMF_IMTYPE_RADHDR) {
+  if (imtype == R_IMF_IMTYPE_RADHDR) {
     return IMB_FTYPE_RADHDR;
   }
 #endif
-  else if (imtype == R_IMF_IMTYPE_PNG) {
+  if (imtype == R_IMF_IMTYPE_PNG) {
     r_options->quality = 15;
     return IMB_FTYPE_PNG;
   }
 #ifdef WITH_DDS
-  else if (imtype == R_IMF_IMTYPE_DDS) {
+  if (imtype == R_IMF_IMTYPE_DDS) {
     return IMB_FTYPE_DDS;
   }
 #endif
-  else if (imtype == R_IMF_IMTYPE_BMP) {
+  if (imtype == R_IMF_IMTYPE_BMP) {
     return IMB_FTYPE_BMP;
   }
 #ifdef WITH_TIFF
-  else if (imtype == R_IMF_IMTYPE_TIFF) {
+  if (imtype == R_IMF_IMTYPE_TIFF) {
     return IMB_FTYPE_TIF;
   }
 #endif
-  else if (imtype == R_IMF_IMTYPE_OPENEXR || imtype == R_IMF_IMTYPE_MULTILAYER) {
+  if (imtype == R_IMF_IMTYPE_OPENEXR || imtype == R_IMF_IMTYPE_MULTILAYER) {
     return IMB_FTYPE_OPENEXR;
   }
 #ifdef WITH_CINEON
-  else if (imtype == R_IMF_IMTYPE_CINEON) {
+  if (imtype == R_IMF_IMTYPE_CINEON) {
     return IMB_FTYPE_CINEON;
   }
-  else if (imtype == R_IMF_IMTYPE_DPX) {
+  if (imtype == R_IMF_IMTYPE_DPX) {
     return IMB_FTYPE_DPX;
   }
 #endif
 #ifdef WITH_OPENJPEG
-  else if (imtype == R_IMF_IMTYPE_JP2) {
+  if (imtype == R_IMF_IMTYPE_JP2) {
     r_options->flag |= JP2_JP2;
     r_options->quality = 90;
     return IMB_FTYPE_JP2;
   }
 #endif
-  else {
-    r_options->quality = 90;
-    return IMB_FTYPE_JPG;
-  }
+
+  r_options->quality = 90;
+  return IMB_FTYPE_JPG;
 }
 
 char BKE_image_ftype_to_imtype(const int ftype, const ImbFormatOptions *options)
@@ -1259,57 +1257,55 @@ char BKE_image_ftype_to_imtype(const int ftype, const ImbFormatOptions *options)
   if (ftype == 0) {
     return R_IMF_IMTYPE_TARGA;
   }
-  else if (ftype == IMB_FTYPE_IMAGIC) {
+  if (ftype == IMB_FTYPE_IMAGIC) {
     return R_IMF_IMTYPE_IRIS;
   }
 #ifdef WITH_HDR
-  else if (ftype == IMB_FTYPE_RADHDR) {
+  if (ftype == IMB_FTYPE_RADHDR) {
     return R_IMF_IMTYPE_RADHDR;
   }
 #endif
-  else if (ftype == IMB_FTYPE_PNG) {
+  if (ftype == IMB_FTYPE_PNG) {
     return R_IMF_IMTYPE_PNG;
   }
 #ifdef WITH_DDS
-  else if (ftype == IMB_FTYPE_DDS) {
+  if (ftype == IMB_FTYPE_DDS) {
     return R_IMF_IMTYPE_DDS;
   }
 #endif
-  else if (ftype == IMB_FTYPE_BMP) {
+  if (ftype == IMB_FTYPE_BMP) {
     return R_IMF_IMTYPE_BMP;
   }
 #ifdef WITH_TIFF
-  else if (ftype == IMB_FTYPE_TIF) {
+  if (ftype == IMB_FTYPE_TIF) {
     return R_IMF_IMTYPE_TIFF;
   }
 #endif
-  else if (ftype == IMB_FTYPE_OPENEXR) {
+  if (ftype == IMB_FTYPE_OPENEXR) {
     return R_IMF_IMTYPE_OPENEXR;
   }
 #ifdef WITH_CINEON
-  else if (ftype == IMB_FTYPE_CINEON) {
+  if (ftype == IMB_FTYPE_CINEON) {
     return R_IMF_IMTYPE_CINEON;
   }
-  else if (ftype == IMB_FTYPE_DPX) {
+  if (ftype == IMB_FTYPE_DPX) {
     return R_IMF_IMTYPE_DPX;
   }
 #endif
-  else if (ftype == IMB_FTYPE_TGA) {
+  if (ftype == IMB_FTYPE_TGA) {
     if (options && (options->flag & RAWTGA)) {
       return R_IMF_IMTYPE_RAWTGA;
     }
-    else {
-      return R_IMF_IMTYPE_TARGA;
-    }
+
+    return R_IMF_IMTYPE_TARGA;
   }
 #ifdef WITH_OPENJPEG
-  else if (ftype == IMB_FTYPE_JP2) {
+  if (ftype == IMB_FTYPE_JP2) {
     return R_IMF_IMTYPE_JP2;
   }
 #endif
-  else {
-    return R_IMF_IMTYPE_JPEG90;
-  }
+
+  return R_IMF_IMTYPE_JPEG90;
 }
 
 bool BKE_imtype_is_movie(const char imtype)
@@ -1443,78 +1439,77 @@ char BKE_imtype_from_arg(const char *imtype_arg)
   if (STREQ(imtype_arg, "TGA")) {
     return R_IMF_IMTYPE_TARGA;
   }
-  else if (STREQ(imtype_arg, "IRIS")) {
+  if (STREQ(imtype_arg, "IRIS")) {
     return R_IMF_IMTYPE_IRIS;
   }
 #ifdef WITH_DDS
-  else if (STREQ(imtype_arg, "DDS")) {
+  if (STREQ(imtype_arg, "DDS")) {
     return R_IMF_IMTYPE_DDS;
   }
 #endif
-  else if (STREQ(imtype_arg, "JPEG")) {
+  if (STREQ(imtype_arg, "JPEG")) {
     return R_IMF_IMTYPE_JPEG90;
   }
-  else if (STREQ(imtype_arg, "IRIZ")) {
+  if (STREQ(imtype_arg, "IRIZ")) {
     return R_IMF_IMTYPE_IRIZ;
   }
-  else if (STREQ(imtype_arg, "RAWTGA")) {
+  if (STREQ(imtype_arg, "RAWTGA")) {
     return R_IMF_IMTYPE_RAWTGA;
   }
-  else if (STREQ(imtype_arg, "AVIRAW")) {
+  if (STREQ(imtype_arg, "AVIRAW")) {
     return R_IMF_IMTYPE_AVIRAW;
   }
-  else if (STREQ(imtype_arg, "AVIJPEG")) {
+  if (STREQ(imtype_arg, "AVIJPEG")) {
     return R_IMF_IMTYPE_AVIJPEG;
   }
-  else if (STREQ(imtype_arg, "PNG")) {
+  if (STREQ(imtype_arg, "PNG")) {
     return R_IMF_IMTYPE_PNG;
   }
-  else if (STREQ(imtype_arg, "BMP")) {
+  if (STREQ(imtype_arg, "BMP")) {
     return R_IMF_IMTYPE_BMP;
   }
 #ifdef WITH_HDR
-  else if (STREQ(imtype_arg, "HDR")) {
+  if (STREQ(imtype_arg, "HDR")) {
     return R_IMF_IMTYPE_RADHDR;
   }
 #endif
 #ifdef WITH_TIFF
-  else if (STREQ(imtype_arg, "TIFF")) {
+  if (STREQ(imtype_arg, "TIFF")) {
     return R_IMF_IMTYPE_TIFF;
   }
 #endif
 #ifdef WITH_OPENEXR
-  else if (STREQ(imtype_arg, "OPEN_EXR")) {
+  if (STREQ(imtype_arg, "OPEN_EXR")) {
     return R_IMF_IMTYPE_OPENEXR;
   }
-  else if (STREQ(imtype_arg, "OPEN_EXR_MULTILAYER")) {
+  if (STREQ(imtype_arg, "OPEN_EXR_MULTILAYER")) {
     return R_IMF_IMTYPE_MULTILAYER;
   }
-  else if (STREQ(imtype_arg, "EXR")) {
+  if (STREQ(imtype_arg, "EXR")) {
     return R_IMF_IMTYPE_OPENEXR;
   }
-  else if (STREQ(imtype_arg, "MULTILAYER")) {
+  if (STREQ(imtype_arg, "MULTILAYER")) {
     return R_IMF_IMTYPE_MULTILAYER;
   }
 #endif
-  else if (STREQ(imtype_arg, "FFMPEG")) {
+  if (STREQ(imtype_arg, "FFMPEG")) {
     return R_IMF_IMTYPE_FFMPEG;
   }
 #ifdef WITH_CINEON
-  else if (STREQ(imtype_arg, "CINEON")) {
+  if (STREQ(imtype_arg, "CINEON")) {
     return R_IMF_IMTYPE_CINEON;
   }
-  else if (STREQ(imtype_arg, "DPX")) {
+  if (STREQ(imtype_arg, "DPX")) {
     return R_IMF_IMTYPE_DPX;
   }
 #endif
 #ifdef WITH_OPENJPEG
-  else if (STREQ(imtype_arg, "JP2")) {
+  if (STREQ(imtype_arg, "JP2")) {
     return R_IMF_IMTYPE_JP2;
   }
 #endif
-  else {
-    return R_IMF_IMTYPE_INVALID;
-  }
+
+  return R_IMF_IMTYPE_INVALID;
 }
 
 static bool do_add_image_extension(char *string,
@@ -1638,13 +1633,11 @@ static bool do_add_image_extension(char *string,
     if (BLI_path_extension_check_array(string, imb_ext_image)) {
       return BLI_path_extension_replace(string, FILE_MAX, extension);
     }
-    else {
-      return BLI_path_extension_ensure(string, FILE_MAX, extension);
-    }
-  }
-  else {
-    return false;
+
+    return BLI_path_extension_ensure(string, FILE_MAX, extension);
   }
+
+  return false;
 }
 
 int BKE_image_path_ensure_ext_from_imformat(char *string, const ImageFormatData *im_format)
@@ -3548,9 +3541,8 @@ static RenderPass *image_render_pass_get(RenderLayer *rl,
         /* no multiview or left eye */
         break;
       }
-      else {
-        rp_name = rpass->name;
-      }
+
+      rp_name = rpass->name;
     }
     /* multiview */
     else if (rp_name[0] && STREQ(rpass->name, rp_name) && (rpass->view_id == view)) {
@@ -3713,9 +3705,8 @@ RenderPass *BKE_image_multilayer_index(RenderResult *rr, ImageUser *iuser)
         iuser->multi_index = index + rp_index;
         break;
       }
-      else {
-        index += BLI_listbase_count(&rl->passes);
-      }
+
+      index += BLI_listbase_count(&rl->passes);
     }
   }
 
@@ -3986,13 +3977,12 @@ static int image_num_files(Image *ima)
   if (!is_multiview) {
     return 1;
   }
-  else if (ima->views_format == R_IMF_VIEWS_STEREO_3D) {
+  if (ima->views_format == R_IMF_VIEWS_STEREO_3D) {
     return 1;
   }
   /* R_IMF_VIEWS_INDIVIDUAL */
-  else {
-    return BLI_listbase_count(&ima->views);
-  }
+
+  return BLI_listbase_count(&ima->views);
 }
 
 static ImBuf *load_sequence_single(
@@ -4707,7 +4697,7 @@ static int image_get_multiview_index(Image *ima, ImageUser *iuser)
   if (is_multilayer) {
     return iuser ? iuser->multi_index : index;
   }
-  else if (is_backdrop) {
+  if (is_backdrop) {
     if (BKE_image_is_stereo(ima)) {
       /* backdrop hackaround (since there is no iuser */
       return ima->eye;
@@ -4844,7 +4834,7 @@ BLI_INLINE bool image_quick_test(Image *ima, const ImageUser *iuser)
   if (tile == NULL) {
     return false;
   }
-  else if (tile->ok == 0) {
+  if (tile->ok == 0) {
     return false;
   }
 
@@ -5161,58 +5151,57 @@ int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, bool *r_is_in_ran
   if (len == 0) {
     return 0;
   }
-  else {
-    int framenr;
-    cfra = cfra - iuser->sfra + 1;
-
-    /* cyclic */
-    if (iuser->cycl) {
-      cfra = ((cfra) % len);
-      if (cfra < 0) {
-        cfra += len;
-      }
-      if (cfra == 0) {
-        cfra = len;
-      }
 
-      if (r_is_in_range) {
-        *r_is_in_range = true;
-      }
-    }
+  int framenr;
+  cfra = cfra - iuser->sfra + 1;
 
+  /* cyclic */
+  if (iuser->cycl) {
+    cfra = ((cfra) % len);
     if (cfra < 0) {
-      cfra = 0;
+      cfra += len;
     }
-    else if (cfra > len) {
+    if (cfra == 0) {
       cfra = len;
     }
-    else {
-      if (r_is_in_range) {
-        *r_is_in_range = true;
-      }
-    }
 
-    /* transform to images space */
-    framenr = cfra;
-    if (framenr > iuser->frames) {
-      framenr = iuser->frames;
+    if (r_is_in_range) {
+      *r_is_in_range = true;
     }
+  }
 
-    if (iuser->cycl) {
-      framenr = ((framenr) % len);
-      while (framenr < 0) {
-        framenr += len;
-      }
-      if (framenr == 0) {
-        framenr = len;
-      }
+  if (cfra < 0) {
+    cfra = 0;
+  }
+  else if (cfra > len) {
+    cfra = len;
+  }
+  else {
+    if (r_is_in_range) {
+      *r_is_in_range = true;
     }
+  }
 
-    /* important to apply after else we cant loop on frames 100 - 110 for eg. */
-    framenr += iuser->offset;
+  /* transform to images space */
+  framenr = cfra;
+  if (framenr > iuser->frames) {
+    framenr = iuser->frames;
+  }
 
-    return framenr;
+  if (iuser->cycl) {
+    framenr = ((framenr) % len);
+    while (framenr < 0) {
+      framenr += len;
+    }
+    if (framenr == 0) {
+      framenr = len;
+    }
   }
+
+  /* important to apply after else we cant loop on frames 100 - 110 for eg. */
+  framenr += iuser->offset;
+
+  return framenr;
 }
 
 void BKE_image_user_frame_calc(Image *ima, ImageUser *iuser, int cfra)
@@ -5378,9 +5367,8 @@ bool BKE_image_has_alpha(struct Image *image)
   if (planes == 32) {
     return true;
   }
-  else {
-    return false;
-  }
+
+  return false;
 }
 
 void BKE_image_get_size(Image *image, ImageUser *iuser, int *r_width, int *r_height)
@@ -5846,17 +5834,16 @@ bool BKE_image_clear_renderslot(Image *ima, ImageUser *iuser, int index)
     RE_ClearResult(re);
     return true;
   }
-  else {
-    RenderSlot *slot = BLI_findlink(&ima->renderslots, index);
-    if (!slot) {
-      return false;
-    }
-    if (slot->render) {
-      RE_FreeRenderResult(slot->render);
-      slot->render = NULL;
-    }
-    return true;
+
+  RenderSlot *slot = BLI_findlink(&ima->renderslots, index);
+  if (!slot) {
+    return false;
   }
+  if (slot->render) {
+    RE_FreeRenderResult(slot->render);
+    slot->render = NULL;
+  }
+  return true;
 }
 
 RenderSlot *BKE_image_get_renderslot(Image *ima, int index)