diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-08-07 13:30:43 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-08-07 14:38:06 +0300 |
commit | 1b272a649b40e99dba4185167f6cee7cbece1942 (patch) | |
tree | 2785f52c566b36cbdcbf9355f698dc520ffbb482 /source/blender/blenkernel/intern/studiolight.c | |
parent | cfc6f9eb18e701f5be601b95c45004e8cf7fbc81 (diff) |
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.
Diffstat (limited to 'source/blender/blenkernel/intern/studiolight.c')
-rw-r--r-- | source/blender/blenkernel/intern/studiolight.c | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c index 46341652544..ade5befeebf 100644 --- a/source/blender/blenkernel/intern/studiolight.c +++ b/source/blender/blenkernel/intern/studiolight.c @@ -366,23 +366,22 @@ static float *studiolight_multilayer_convert_pass(ImBuf *ibuf, if (channels == 4) { return rect; } - else { - float *new_rect = MEM_callocN(sizeof(float[4]) * ibuf->x * ibuf->y, __func__); - - IMB_buffer_float_from_float(new_rect, - rect, - channels, - IB_PROFILE_LINEAR_RGB, - IB_PROFILE_LINEAR_RGB, - false, - ibuf->x, - ibuf->y, - ibuf->x, - ibuf->x); - MEM_freeN(rect); - return new_rect; - } + float *new_rect = MEM_callocN(sizeof(float[4]) * ibuf->x * ibuf->y, __func__); + + IMB_buffer_float_from_float(new_rect, + rect, + channels, + IB_PROFILE_LINEAR_RGB, + IB_PROFILE_LINEAR_RGB, + false, + ibuf->x, + ibuf->y, + ibuf->x, + ibuf->x); + + MEM_freeN(rect); + return new_rect; } static void studiolight_multilayer_addpass(void *base, @@ -1229,12 +1228,11 @@ static int studiolight_cmp(const void *a, const void *b) if (flagorder1 < flagorder2) { return -1; } - else if (flagorder1 > flagorder2) { + if (flagorder1 > flagorder2) { return 1; } - else { - return BLI_strcasecmp(sl1->name, sl2->name); - } + + return BLI_strcasecmp(sl1->name, sl2->name); } /* icons */ @@ -1496,10 +1494,9 @@ struct StudioLight *BKE_studiolight_find(const char *name, int flag) if ((sl->flag & flag)) { return sl; } - else { - /* flags do not match, so use default */ - return BKE_studiolight_find_default(flag); - } + + /* flags do not match, so use default */ + return BKE_studiolight_find_default(flag); } } /* When not found, use the default studio light */ |