blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Code cleanup: unreachable break/return

This commit is contained in:
Campbell Barton 2014-03-19 12:46:33 +11:00
parent f127f49b4d
commit a91247c2b4
Notes: blender-bot 2023-02-14 10:57:58 +01:00 
Referenced by issue #39266, Weird Skin modifier shutdown
21 changed files with 10 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/avi/intern/avi_codecs.c
View File

@ -106,10 +106,8 @@ int avi_get_format_type(AviFormat format)
case AVI_FORMAT_AVI_RGB:
case AVI_FORMAT_MJPEG:
return FCC("vids");
break;
default:
return 0;
break;
}
}
@ -120,13 +118,10 @@ int avi_get_format_fcc(AviFormat format)
case AVI_FORMAT_RGB32:
case AVI_FORMAT_AVI_RGB:
return FCC("DIB ");
break;
case AVI_FORMAT_MJPEG:
return FCC("MJPG");
break;
default:
return 0;
break;
}
}
@ -137,12 +132,9 @@ int avi_get_format_compression(AviFormat format)
case AVI_FORMAT_RGB32:
case AVI_FORMAT_AVI_RGB:
return 0;
break;
case AVI_FORMAT_MJPEG:
return FCC("MJPG");
break;
default:
return 0;
break;
}
}

1
source/blender/avi/intern/avi_options.c
View File

@ -125,7 +125,6 @@ AviError AVI_set_compress_option(AviMovie *movie, int option_type, int stream, A
break;
default:
return AVI_ERROR_OPTION;
break;
}
return AVI_ERROR_NONE;

2
source/blender/blenkernel/intern/mask_evaluate.c
View File

@ -718,11 +718,9 @@ float (*BKE_mask_spline_feather_differentiated_points_with_resolution(
switch (spline->offset_mode) {
case MASK_SPLINE_OFFSET_EVEN:
return mask_spline_feather_differentiated_points_with_resolution__even(spline, tot_feather_point, resol, do_feather_isect);
break;
case MASK_SPLINE_OFFSET_SMOOTH:
default:
return mask_spline_feather_differentiated_points_with_resolution__double(spline, tot_feather_point, resol, do_feather_isect);
break;
}
}

6
source/blender/blenkernel/intern/material.c
View File

@ -507,13 +507,10 @@ Material ***give_matarar_id(ID *id)
switch (GS(id->name)) {
case ID_ME:
return &(((Mesh *)id)->mat);
break;
case ID_CU:
return &(((Curve *)id)->mat);
break;
case ID_MB:
return &(((MetaBall *)id)->mat);
break;
}
return NULL;
}
@ -526,13 +523,10 @@ short *give_totcolp_id(ID *id)
switch (GS(id->name)) {
case ID_ME:
return &(((Mesh *)id)->totcol);
break;
case ID_CU:
return &(((Curve *)id)->totcol);
break;
case ID_MB:
return &(((MetaBall *)id)->totcol);
break;
}
return NULL;
}

2
source/blender/blenlib/intern/BLI_kdopbvh.c
View File

@ -127,10 +127,12 @@ MINLINE axis_t min_axis(axis_t a, axis_t b)
{
return (a < b) ? a : b;
}
#if 0
MINLINE axis_t max_axis(axis_t a, axis_t b)
{
return (b < a) ? a : b;
}
#endif
#if 0

4
source/blender/blenlib/intern/cpu.c
View File

@ -52,8 +52,8 @@ int BLI_cpu_support_sse2(void)
mov d, edx
}
return (d & 0x04000000) != 0;
#endif
#else
return 0;
#endif
}

3
source/blender/editors/animation/anim_channels_defines.c
View File

@ -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;
}
}
}

2
source/blender/editors/animation/keyframing.c
View File

@ -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 */

1
source/blender/editors/mesh/editmesh_knife.c
View File

@ -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 */

9
source/blender/editors/mesh/editmesh_path.c
View File

@ -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;

1
source/blender/editors/object/object_bake.c
View File

@ -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;
}

1
source/blender/editors/render/render_internal.c
View File

@ -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;
}

1
source/blender/editors/space_clip/clip_ops.c
View File

@ -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;

4
source/blender/editors/space_clip/tracking_ops.c
View File

@ -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;

7
source/blender/editors/space_nla/nla_select.c
View File

@ -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;
}
}

1
source/blender/editors/transform/transform_orientations.c
View File

@ -229,7 +229,6 @@ static TransformOrientation *createMeshSpace(bContext *C, ReportList *reports,
break;
default:
return NULL;
break;
}
return addMatrixSpace(C, mat, name, overwrite);

6
source/blender/freestyle/intern/python/BPy_Id.cpp
View File

@ -105,22 +105,16 @@ static PyObject *Id_RichCompare(BPy_Id *o1, BPy_Id *o2, int opid)
switch (opid) {
case Py_LT:
return PyBool_from_bool(o1->id->operator<(*(o2->id)));
break;
case Py_LE:
return PyBool_from_bool(o1->id->operator<(*(o2->id)) || o1->id->operator==(*(o2->id)));
break;
case Py_EQ:
return PyBool_from_bool(o1->id->operator==(*(o2->id)));
break;
case Py_NE:
return PyBool_from_bool(o1->id->operator!=(*(o2->id)));
break;
case Py_GT:
return PyBool_from_bool(!(o1->id->operator<(*(o2->id)) || o1->id->operator==(*(o2->id))));
break;
case Py_GE:
return PyBool_from_bool(!(o1->id->operator<(*(o2->id))));
break;
}
Py_RETURN_NONE;
}

6
source/blender/imbuf/intern/colormanagement.c
View File

@ -1164,22 +1164,16 @@ const char *IMB_colormanagement_role_colorspace_name_get(int role)
switch (role) {
case COLOR_ROLE_SCENE_LINEAR:
return global_role_scene_linear;
break;
case COLOR_ROLE_COLOR_PICKING:
return global_role_color_picking;
break;
case COLOR_ROLE_TEXTURE_PAINTING:
return global_role_texture_painting;
break;
case COLOR_ROLE_DEFAULT_SEQUENCER:
return global_role_default_sequencer;
break;
case COLOR_ROLE_DEFAULT_FLOAT:
return global_role_default_float;
break;
case COLOR_ROLE_DEFAULT_BYTE:
return global_role_default_byte;
break;
default:
printf("Unknown role was passed to %s\n", __func__);
BLI_assert(0);

2
source/blender/imbuf/intern/indexer.c
View File

@ -336,7 +336,6 @@ int IMB_proxy_size_to_array_index(IMB_Proxy_Size pr_size)
default:
return 0;
}
return 0;
}
int IMB_timecode_to_array_index(IMB_Timecode_Type tc)
@ -356,7 +355,6 @@ int IMB_timecode_to_array_index(IMB_Timecode_Type tc)
default:
return 0;
}
return 0;
}

1
source/blender/python/intern/bpy_rna.c
View File

@ -1920,7 +1920,6 @@ static int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyOb
error_prefix, RNA_struct_identifier(ptr->type),
RNA_property_identifier(prop));
return -1;
break;
}
}

2
source/blender/windowmanager/intern/wm_operators.c
View File

@ -3067,7 +3067,6 @@ int WM_border_select_modal(bContext *C, wmOperator *op, const wmEvent *event)
}
wm_gesture_end(C, op);
return OPERATOR_CANCELLED;
break;
case GESTURE_MODAL_CANCEL:
wm_gesture_end(C, op);
@ -3588,7 +3587,6 @@ int WM_gesture_straightline_modal(bContext *C, wmOperator *op, const wmEvent *ev
}
wm_gesture_end(C, op);
return OPERATOR_CANCELLED;
break;
case GESTURE_MODAL_CANCEL:
wm_gesture_end(C, op);