Code cleanup: unreachable break/return

21 files changed, 10 insertions, 60 deletions

diff --git a/source/blender/avi/intern/avi_codecs.c b/source/blender/avi/intern/avi_codecs.c
index e43826064a6..c14d088c8ea 100644
--- a/source/blender/avi/intern/avi_codecs.c
+++ b/source/blender/avi/intern/avi_codecs.c
@@ -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;
 	}
 }
diff --git a/source/blender/avi/intern/avi_options.c b/source/blender/avi/intern/avi_options.c
index c552cbe8724..47c18831cbd 100644
--- a/source/blender/avi/intern/avi_options.c
+++ b/source/blender/avi/intern/avi_options.c
@@ -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;
diff --git a/source/blender/blenkernel/intern/mask_evaluate.c b/source/blender/blenkernel/intern/mask_evaluate.c
index 4d9791a077c..33e74582750 100644
--- a/source/blender/blenkernel/intern/mask_evaluate.c
+++ b/source/blender/blenkernel/intern/mask_evaluate.c
@@ -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;
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 5f6331315f8..0dd62ae730d 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -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;
 }
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index 41c5707cf4c..7ea0834d9f4 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -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
 
diff --git a/source/blender/blenlib/intern/cpu.c b/source/blender/blenlib/intern/cpu.c
index d942ffdf2c9..784b1900785 100644
--- a/source/blender/blenlib/intern/cpu.c
+++ b/source/blender/blenlib/intern/cpu.c
@@ -52,8 +52,8 @@ int BLI_cpu_support_sse2(void)
 		mov d, edx
 	}
 	return (d & 0x04000000) != 0;
-#endif
-
+#else
 	return 0;
+#endif
 }
 
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);
diff --git a/source/blender/freestyle/intern/python/BPy_Id.cpp b/source/blender/freestyle/intern/python/BPy_Id.cpp
index 8cf20401dd0..7ef56f6baee 100644
--- a/source/blender/freestyle/intern/python/BPy_Id.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Id.cpp
@@ -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;
 }
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index e8ffdc83240..efd3037cda0 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -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);
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
index 2afcda8a1a6..14967c32477 100644
--- a/source/blender/imbuf/intern/indexer.c
+++ b/source/blender/imbuf/intern/indexer.c
@@ -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;
 }
 
 
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 23308bf997d..cf13efae60e 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -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;
 		}
 	}
 
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index bcbe7f07676..2752d33e5f8 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -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);