diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-07-03 18:20:41 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-07-03 18:42:45 +0300 |
commit | a201020cd3048af0a3068e4ba387ee8d16a35c1a (patch) | |
tree | 163f21c6c6e16f5f987c46d9bce6c40833128cf3 /source/blender/editors/space_clip/clip_ops.c | |
parent | f254f66587f257b7de252644dd73574ad27a32af (diff) |
Cleanup: Editors/Space/Clip, Clang-Tidy else-after-return fixes
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/editors/space_clip` module.
No functional changes.
Diffstat (limited to 'source/blender/editors/space_clip/clip_ops.c')
-rw-r--r-- | source/blender/editors/space_clip/clip_ops.c | 50 |
1 files changed, 23 insertions, 27 deletions
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index 22707b97afa..a69601316ef 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -463,11 +463,10 @@ static int view_pan_invoke(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_FINISHED; } - else { - view_pan_init(C, op, event); - return OPERATOR_RUNNING_MODAL; - } + view_pan_init(C, op, event); + + return OPERATOR_RUNNING_MODAL; } static int view_pan_modal(bContext *C, wmOperator *op, const wmEvent *event) @@ -633,11 +632,10 @@ static int view_zoom_invoke(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_FINISHED; } - else { - view_zoom_init(C, op, event); - return OPERATOR_RUNNING_MODAL; - } + view_zoom_init(C, op, event); + + return OPERATOR_RUNNING_MODAL; } static void view_zoom_apply( @@ -1253,10 +1251,9 @@ static void do_movie_proxy(void *pjv, return; } - else { - sfra = 1; - efra = clip->len; - } + + sfra = 1; + efra = clip->len; if (build_undistort_count) { int threads = BLI_system_thread_count(); @@ -1646,27 +1643,26 @@ static int clip_view_ndof_invoke(bContext *C, wmOperator *UNUSED(op), const wmEv if (event->type != NDOF_MOTION) { return OPERATOR_CANCELLED; } - else { - SpaceClip *sc = CTX_wm_space_clip(C); - ARegion *region = CTX_wm_region(C); - float pan_vec[3]; - const wmNDOFMotionData *ndof = event->customdata; - const float speed = NDOF_PIXELS_PER_SECOND; + SpaceClip *sc = CTX_wm_space_clip(C); + ARegion *region = CTX_wm_region(C); + float pan_vec[3]; + + const wmNDOFMotionData *ndof = event->customdata; + const float speed = NDOF_PIXELS_PER_SECOND; - WM_event_ndof_pan_get(ndof, pan_vec, true); + WM_event_ndof_pan_get(ndof, pan_vec, true); - mul_v2_fl(pan_vec, (speed * ndof->dt) / sc->zoom); - pan_vec[2] *= -ndof->dt; + mul_v2_fl(pan_vec, (speed * ndof->dt) / sc->zoom); + pan_vec[2] *= -ndof->dt; - sclip_zoom_set_factor(C, 1.0f + pan_vec[2], NULL, false); - sc->xof += pan_vec[0]; - sc->yof += pan_vec[1]; + sclip_zoom_set_factor(C, 1.0f + pan_vec[2], NULL, false); + sc->xof += pan_vec[0]; + sc->yof += pan_vec[1]; - ED_region_tag_redraw(region); + ED_region_tag_redraw(region); - return OPERATOR_FINISHED; - } + return OPERATOR_FINISHED; } void CLIP_OT_view_ndof(wmOperatorType *ot) |