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/space_image | |
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/space_image')
-rw-r--r-- | source/blender/editors/space_image/image_buttons.c | 10 | ||||
-rw-r--r-- | source/blender/editors/space_image/image_ops.c | 107 |
2 files changed, 51 insertions, 66 deletions
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 6f3ef44fe94..24ec2393b69 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -139,9 +139,7 @@ static bool ui_imageuser_slot_menu_step(bContext *C, int direction, void *image_ WM_event_add_notifier(C, NC_IMAGE | ND_DRAW, NULL); return true; } - else { - return true; - } + return true; } static const char *ui_imageuser_layer_fake_name(RenderResult *rr) @@ -150,12 +148,10 @@ static const char *ui_imageuser_layer_fake_name(RenderResult *rr) if (rv->rectf) { return IFACE_("Composite"); } - else if (rv->rect32) { + if (rv->rect32) { return IFACE_("Sequence"); } - else { - return NULL; - } + return NULL; } /* workaround for passing many args */ diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index f71c92b4c1f..4702b01901d 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -198,11 +198,10 @@ static Image *image_from_context(const bContext *C) if (ima) { return ima; } - else { - /* Image editor. */ - SpaceImage *sima = CTX_wm_space_image(C); - return (sima) ? sima->image : NULL; - } + + /* Image editor. */ + SpaceImage *sima = CTX_wm_space_image(C); + return (sima) ? sima->image : NULL; } static ImageUser *image_user_from_context(const bContext *C) @@ -214,11 +213,10 @@ static ImageUser *image_user_from_context(const bContext *C) if (iuser) { return iuser; } - else { - /* Image editor. */ - SpaceImage *sima = CTX_wm_space_image(C); - return (sima) ? &sima->iuser : NULL; - } + + /* Image editor. */ + SpaceImage *sima = CTX_wm_space_image(C); + return (sima) ? &sima->iuser : NULL; } static bool image_from_context_has_data_poll(bContext *C) @@ -359,10 +357,9 @@ static int image_view_pan_invoke(bContext *C, wmOperator *op, const wmEvent *eve image_view_pan_exec(C, op); return OPERATOR_FINISHED; } - else { - image_view_pan_init(C, op, event); - return OPERATOR_RUNNING_MODAL; - } + + image_view_pan_init(C, op, event); + return OPERATOR_RUNNING_MODAL; } static int image_view_pan_modal(bContext *C, wmOperator *op, const wmEvent *event) @@ -549,10 +546,9 @@ static int image_view_zoom_invoke(bContext *C, wmOperator *op, const wmEvent *ev return OPERATOR_FINISHED; } - else { - image_view_zoom_init(C, op, event); - return OPERATOR_RUNNING_MODAL; - } + + image_view_zoom_init(C, op, event); + return OPERATOR_RUNNING_MODAL; } static void image_zoom_apply(ViewZoomData *vpd, @@ -697,27 +693,26 @@ static int image_view_ndof_invoke(bContext *C, wmOperator *UNUSED(op), const wmE if (event->type != NDOF_MOTION) { return OPERATOR_CANCELLED; } - else { - SpaceImage *sima = CTX_wm_space_image(C); - ARegion *region = CTX_wm_region(C); - float pan_vec[3]; - const wmNDOFMotionData *ndof = event->customdata; - const float speed = NDOF_PIXELS_PER_SECOND; + SpaceImage *sima = CTX_wm_space_image(C); + ARegion *region = CTX_wm_region(C); + float pan_vec[3]; - WM_event_ndof_pan_get(ndof, pan_vec, true); + const wmNDOFMotionData *ndof = event->customdata; + const float speed = NDOF_PIXELS_PER_SECOND; - mul_v2_fl(pan_vec, (speed * ndof->dt) / sima->zoom); - pan_vec[2] *= -ndof->dt; + WM_event_ndof_pan_get(ndof, pan_vec, true); - sima_zoom_set_factor(sima, region, 1.0f + pan_vec[2], NULL, false); - sima->xof += pan_vec[0]; - sima->yof += pan_vec[1]; + mul_v2_fl(pan_vec, (speed * ndof->dt) / sima->zoom); + pan_vec[2] *= -ndof->dt; - ED_region_tag_redraw(region); + sima_zoom_set_factor(sima, region, 1.0f + pan_vec[2], NULL, false); + sima->xof += pan_vec[0]; + sima->yof += pan_vec[1]; - return OPERATOR_FINISHED; - } + ED_region_tag_redraw(region); + + return OPERATOR_FINISHED; } void IMAGE_OT_view_ndof(wmOperatorType *ot) @@ -1678,24 +1673,23 @@ static char imtype_best_depth(ImBuf *ibuf, const char imtype) } return R_IMF_CHAN_DEPTH_8; } - else { - if (depth_ok & R_IMF_CHAN_DEPTH_8) { - return R_IMF_CHAN_DEPTH_8; - } - if (depth_ok & R_IMF_CHAN_DEPTH_12) { - return R_IMF_CHAN_DEPTH_12; - } - if (depth_ok & R_IMF_CHAN_DEPTH_16) { - return R_IMF_CHAN_DEPTH_16; - } - if (depth_ok & R_IMF_CHAN_DEPTH_24) { - return R_IMF_CHAN_DEPTH_24; - } - if (depth_ok & R_IMF_CHAN_DEPTH_32) { - return R_IMF_CHAN_DEPTH_32; - } - return R_IMF_CHAN_DEPTH_8; /* fallback, should not get here */ + + if (depth_ok & R_IMF_CHAN_DEPTH_8) { + return R_IMF_CHAN_DEPTH_8; } + if (depth_ok & R_IMF_CHAN_DEPTH_12) { + return R_IMF_CHAN_DEPTH_12; + } + if (depth_ok & R_IMF_CHAN_DEPTH_16) { + return R_IMF_CHAN_DEPTH_16; + } + if (depth_ok & R_IMF_CHAN_DEPTH_24) { + return R_IMF_CHAN_DEPTH_24; + } + if (depth_ok & R_IMF_CHAN_DEPTH_32) { + return R_IMF_CHAN_DEPTH_32; + } + return R_IMF_CHAN_DEPTH_8; /* fallback, should not get here */ } static int image_save_options_init(Main *bmain, @@ -2147,9 +2141,8 @@ static int image_save_exec(bContext *C, wmOperator *op) if (ok) { return OPERATOR_FINISHED; } - else { - return OPERATOR_CANCELLED; - } + + return OPERATOR_CANCELLED; } static int image_save_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) @@ -2160,9 +2153,7 @@ static int image_save_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED( WM_operator_name_call(C, "IMAGE_OT_save_as", WM_OP_INVOKE_DEFAULT, NULL); return OPERATOR_CANCELLED; } - else { - return image_save_exec(C, op); - } + return image_save_exec(C, op); } void IMAGE_OT_save(wmOperatorType *ot) @@ -2294,9 +2285,7 @@ static bool image_should_be_saved(Image *ima, bool *is_format_writable) ELEM(ima->source, IMA_SRC_FILE, IMA_SRC_GENERATED, IMA_SRC_TILED)) { return image_should_be_saved_when_modified(ima); } - else { - return false; - } + return false; } static bool image_has_valid_path(Image *ima) |