diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-07-03 18:30:31 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-07-03 18:42:46 +0300 |
commit | 33a74941c5fd4efb6eefcaace3315d3e2b65681f (patch) | |
tree | 2d3da68b73e4419750c7f767bbb78bf1a303ad18 /source/blender/editors/render | |
parent | 367034f210137754ab4f07a0e7793066d2b69e59 (diff) |
Cleanup: Editors, Clang-Tidy else-after-return fixes
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/editors` module.
No functional changes.
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r-- | source/blender/editors/render/render_internal.c | 10 | ||||
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 20 | ||||
-rw-r--r-- | source/blender/editors/render/render_shading.c | 6 | ||||
-rw-r--r-- | source/blender/editors/render/render_view.c | 4 |
4 files changed, 18 insertions, 22 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 1db7bf5a766..25b4ddc15fd 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -220,12 +220,10 @@ static void image_buffer_rect_update(RenderJob *rj, ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID; return; } - else { - if (rr->renlay == NULL) { - return; - } - rectf = RE_RenderLayerGetPass(rr->renlay, RE_PASSNAME_COMBINED, viewname); + if (rr->renlay == NULL) { + return; } + rectf = RE_RenderLayerGetPass(rr->renlay, RE_PASSNAME_COMBINED, viewname); } if (rectf == NULL) { return; @@ -579,7 +577,7 @@ static void image_rect_update(void *rjv, RenderResult *rr, volatile rcti *renrec rj->image_outdated = true; return; } - else if (rj->image_outdated) { + if (rj->image_outdated) { /* update entire render */ rj->image_outdated = false; BKE_image_signal(rj->main, ima, NULL, IMA_SIGNAL_COLORMANAGE); diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index e2444d4e3b5..673df69bf9b 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -1236,9 +1236,8 @@ static int screen_opengl_render_modal(bContext *C, wmOperator *op, const wmEvent screen_opengl_render_end(C, op->customdata); return OPERATOR_FINISHED; } - else { - ret = screen_opengl_render_anim_step(C, op); - } + + ret = screen_opengl_render_anim_step(C, op); /* stop at the end or on error */ if (ret == false) { @@ -1291,16 +1290,15 @@ static int screen_opengl_render_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } - else { - bool ret = true; - if (!screen_opengl_render_anim_initialize(C, op)) { - return OPERATOR_CANCELLED; - } + bool ret = true; - while (ret) { - ret = screen_opengl_render_anim_step(C, op); - } + if (!screen_opengl_render_anim_initialize(C, op)) { + return OPERATOR_CANCELLED; + } + + while (ret) { + ret = screen_opengl_render_anim_step(C, op); } /* no redraw needed, we leave state as we entered it */ diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 0e15db17e14..754f8226684 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -1666,13 +1666,13 @@ static int freestyle_get_modifier_type(PointerRNA *ptr) if (RNA_struct_is_a(ptr->type, &RNA_LineStyleColorModifier)) { return LS_MODIFIER_TYPE_COLOR; } - else if (RNA_struct_is_a(ptr->type, &RNA_LineStyleAlphaModifier)) { + if (RNA_struct_is_a(ptr->type, &RNA_LineStyleAlphaModifier)) { return LS_MODIFIER_TYPE_ALPHA; } - else if (RNA_struct_is_a(ptr->type, &RNA_LineStyleThicknessModifier)) { + if (RNA_struct_is_a(ptr->type, &RNA_LineStyleThicknessModifier)) { return LS_MODIFIER_TYPE_THICKNESS; } - else if (RNA_struct_is_a(ptr->type, &RNA_LineStyleGeometryModifier)) { + if (RNA_struct_is_a(ptr->type, &RNA_LineStyleGeometryModifier)) { return LS_MODIFIER_TYPE_GEOMETRY; } return -1; diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c index a9c855b14b0..fd5963b217b 100644 --- a/source/blender/editors/render/render_view.c +++ b/source/blender/editors/render/render_view.c @@ -283,12 +283,12 @@ static int render_view_cancel_exec(bContext *C, wmOperator *UNUSED(op)) return OPERATOR_FINISHED; } - else if (sima->flag & SI_FULLWINDOW) { + if (sima->flag & SI_FULLWINDOW) { sima->flag &= ~SI_FULLWINDOW; ED_screen_state_toggle(C, win, area, SCREENMAXIMIZED); return OPERATOR_FINISHED; } - else if (WM_window_is_temp_screen(win)) { + if (WM_window_is_temp_screen(win)) { wm_window_close(C, CTX_wm_manager(C), win); return OPERATOR_FINISHED; } |