diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-03-19 05:46:33 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-19 05:47:09 +0400 |
commit | a91247c2b4702cbdd423fb5526c2f5a8d04c65d8 (patch) | |
tree | b18f3c10365e52f78eb10f249f5beb8f94477468 /source/blender/editors | |
parent | f127f49b4d8f06fc4328d470e6fae3e4ebf5cff6 (diff) |
Code cleanup: unreachable break/return
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 3 | ||||
-rw-r--r-- | source/blender/editors/animation/keyframing.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_knife.c | 1 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_path.c | 9 | ||||
-rw-r--r-- | source/blender/editors/object/object_bake.c | 1 | ||||
-rw-r--r-- | source/blender/editors/render/render_internal.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_clip/clip_ops.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_clip/tracking_ops.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_select.c | 7 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_orientations.c | 1 |
10 files changed, 6 insertions, 24 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 00a9ff2defb..3f81bb35db5 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -3049,7 +3049,6 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting return ((*val) & flag) == 0; else return ((*val) & flag) != 0; - break; } case sizeof(short): /* short pointer for setting */ { @@ -3059,7 +3058,6 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting return ((*val) & flag) == 0; else return ((*val) & flag) != 0; - break; } case sizeof(char): /* char pointer for setting */ { @@ -3069,7 +3067,6 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting return ((*val) & flag) == 0; else return ((*val) & flag) != 0; - break; } } } diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 8ffc3199f2b..069f66135e3 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -2026,8 +2026,6 @@ short id_frame_has_keyframe(ID *id, float frame, short filter) switch (GS(id->name)) { case ID_OB: /* object */ return object_frame_has_keyframe((Object *)id, frame, filter); - break; - #if 0 // XXX TODO... for now, just use 'normal' behavior case ID_SCE: /* scene */ diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 9087643290a..cffd38b2a30 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -2861,7 +2861,6 @@ static int knifetool_modal(bContext *C, wmOperator *op, const wmEvent *event) ED_region_tag_redraw(kcd->ar); return OPERATOR_PASS_THROUGH; - break; } } else { /* non-modal-mapped events */ diff --git a/source/blender/editors/mesh/editmesh_path.c b/source/blender/editors/mesh/editmesh_path.c index a6e4f504bd9..373c4efb34d 100644 --- a/source/blender/editors/mesh/editmesh_path.c +++ b/source/blender/editors/mesh/editmesh_path.c @@ -176,11 +176,10 @@ static bool edgetag_test_cb(BMEdge *e, void *user_data_v) return BM_elem_float_data_get(&bm->edata, e, CD_BWEIGHT) ? true : false; #ifdef WITH_FREESTYLE case EDGE_MODE_TAG_FREESTYLE: - { - FreestyleEdge *fed = CustomData_bmesh_get(&bm->edata, e->head.data, CD_FREESTYLE_EDGE); - return (!fed) ? FALSE : (fed->flag & FREESTYLE_EDGE_MARK) ? true : false; - } - break; + { + FreestyleEdge *fed = CustomData_bmesh_get(&bm->edata, e->head.data, CD_FREESTYLE_EDGE); + return (!fed) ? FALSE : (fed->flag & FREESTYLE_EDGE_MARK) ? true : false; + } #endif } return 0; diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index 0a4bbf10bf0..1f022c922e8 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -765,7 +765,6 @@ static int objects_bake_render_modal(bContext *C, wmOperator *UNUSED(op), const switch (event->type) { case ESCKEY: return OPERATOR_RUNNING_MODAL; - break; } return OPERATOR_PASS_THROUGH; } diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index eae15e7766d..9531c7793d3 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -744,7 +744,6 @@ static int screen_render_modal(bContext *C, wmOperator *op, const wmEvent *event switch (event->type) { case ESCKEY: return OPERATOR_RUNNING_MODAL; - break; } return OPERATOR_PASS_THROUGH; } diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index bb6c50d6224..14cd7de0125 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -1378,7 +1378,6 @@ static int clip_prefetch_modal(bContext *C, wmOperator *UNUSED(op), const wmEven switch (event->type) { case ESCKEY: return OPERATOR_RUNNING_MODAL; - break; } return OPERATOR_PASS_THROUGH; diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 85e420f3e86..708c59729a5 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -191,7 +191,6 @@ static int add_marker_at_click_modal(bContext *C, wmOperator *UNUSED(op), const switch (event->type) { case MOUSEMOVE: return OPERATOR_RUNNING_MODAL; - break; case LEFTMOUSE: ED_area_headerprint(CTX_wm_area(C), NULL); @@ -206,7 +205,6 @@ static int add_marker_at_click_modal(bContext *C, wmOperator *UNUSED(op), const WM_event_add_notifier(C, NC_MOVIECLIP | NA_EDITED, clip); return OPERATOR_FINISHED; - break; case ESCKEY: ED_area_headerprint(CTX_wm_area(C), NULL); @@ -1497,7 +1495,6 @@ static int track_markers_modal(bContext *C, wmOperator *UNUSED(op), const wmEven switch (event->type) { case ESCKEY: return OPERATOR_RUNNING_MODAL; - break; } return OPERATOR_PASS_THROUGH; @@ -1765,7 +1762,6 @@ static int solve_camera_modal(bContext *C, wmOperator *UNUSED(op), const wmEvent switch (event->type) { case ESCKEY: return OPERATOR_RUNNING_MODAL; - break; } return OPERATOR_PASS_THROUGH; diff --git a/source/blender/editors/space_nla/nla_select.c b/source/blender/editors/space_nla/nla_select.c index f723696de69..2bd2b660bcd 100644 --- a/source/blender/editors/space_nla/nla_select.c +++ b/source/blender/editors/space_nla/nla_select.c @@ -67,16 +67,13 @@ static short selmodes_to_flagmodes(short sel) switch (sel) { case SELECT_SUBTRACT: return ACHANNEL_SETFLAG_CLEAR; - break; - + case SELECT_INVERT: return ACHANNEL_SETFLAG_INVERT; - break; - + case SELECT_ADD: default: return ACHANNEL_SETFLAG_ADD; - break; } } diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 0182e7ac7a7..0279ee0cd3d 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -229,7 +229,6 @@ static TransformOrientation *createMeshSpace(bContext *C, ReportList *reports, break; default: return NULL; - break; } return addMatrixSpace(C, mat, name, overwrite); |