From 7db1d6556d2aefcf4e5e787477b7cd22104e15ac Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sun, 21 Jul 2013 08:16:37 +0000
Subject: code cleanup: add break statements in switch ()'s, (even at the last
 case).

---
 source/blender/blenkernel/intern/armature.c    |  1 +
 source/blender/blenkernel/intern/curve.c       |  1 +
 source/blender/blenkernel/intern/customdata.c  |  1 +
 source/blender/blenkernel/intern/editmesh.c    |  1 +
 source/blender/blenkernel/intern/fcurve.c      |  1 +
 source/blender/blenkernel/intern/fmodifier.c   |  2 ++
 source/blender/blenkernel/intern/idprop.c      | 10 ++++------
 source/blender/blenkernel/intern/image.c       |  3 +++
 source/blender/blenkernel/intern/library.c     |  1 +
 source/blender/blenkernel/intern/object.c      |  1 +
 source/blender/blenkernel/intern/packedFile.c  |  7 +++++--
 source/blender/blenkernel/intern/paint.c       |  9 +++------
 source/blender/blenkernel/intern/rigidbody.c   |  2 +-
 source/blender/blenkernel/intern/text.c        |  3 +++
 source/blender/blenkernel/intern/writeffmpeg.c |  1 +
 15 files changed, 29 insertions(+), 15 deletions(-)

(limited to 'source/blender/blenkernel')

diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 2ede5acd6e9..d37ccae3089 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1329,6 +1329,7 @@ void BKE_pchan_mat3_to_rot(bPoseChannel *pchan, float mat[3][3], short use_compa
 				mat3_to_compatible_eulO(pchan->eul, pchan->eul, pchan->rotmode, mat);
 			else
 				mat3_to_eulO(pchan->eul, pchan->rotmode, mat);
+			break;
 	}
 }
 
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 00a479b8b88..b6c4505bd78 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -2173,6 +2173,7 @@ static void make_bevel_list_3D(BevList *bl, int smooth_iter, int twist_mode)
 			break;
 		default: /* CU_TWIST_Z_UP default, pre 2.49c */
 			make_bevel_list_3D_zup(bl);
+			break;
 	}
 
 	if (bl->poly == -1) /* check its not cyclic */
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 28fa5cc689b..92b3c26c91a 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -2391,6 +2391,7 @@ bool CustomData_bmesh_merge(CustomData *source, CustomData *dest,
 			BLI_assert(!"invalid type given");
 			iter_type = BM_VERTS_OF_MESH;
 			totelem = bm->totvert;
+			break;
 	}
 
 	dest->pool = NULL;
diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c
index 3e925b73116..74cd8834d5d 100644
--- a/source/blender/blenkernel/intern/editmesh.c
+++ b/source/blender/blenkernel/intern/editmesh.c
@@ -373,5 +373,6 @@ void BKE_editmesh_color_ensure(BMEditMesh *em, const char htype)
 			break;
 		default:
 			BLI_assert(0);
+			break;
 	}
 }
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index 55a312f31ba..791c47cc551 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -1764,6 +1764,7 @@ static float evaluate_driver(ChannelDriver *driver, const float evaltime)
 			 *	This is currently used as the mechanism which allows animated settings to be able
 			 *  to be changed via the UI.
 			 */
+			break;
 		}
 	}
 	
diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c
index 234f8667632..915c75a0e7f 100644
--- a/source/blender/blenkernel/intern/fmodifier.c
+++ b/source/blender/blenkernel/intern/fmodifier.c
@@ -343,6 +343,8 @@ static void fcm_fn_generator_evaluate(FCurve *UNUSED(fcu), FModifier *fcm, float
 		}
 		default:
 			printf("Invalid Function-Generator for F-Modifier - %d\n", data->type);
+			break;
+
 	}
 	
 	/* execute function callback to set value if appropriate */
diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c
index f60823edcc8..f20506af967 100644
--- a/source/blender/blenkernel/intern/idprop.c
+++ b/source/blender/blenkernel/intern/idprop.c
@@ -445,6 +445,7 @@ void IDP_SyncGroupValues(IDProperty *dest, IDProperty *src)
 
 					IDP_FreeProperty(tmp);
 					MEM_freeN(tmp);
+					break;
 				}
 			}
 		}
@@ -709,9 +710,7 @@ int IDP_EqualsProperties_ex(IDProperty *prop1, IDProperty *prop2, const int is_s
 			if (prop1->len == prop2->len && prop1->subtype == prop2->subtype) {
 				return memcmp(IDP_Array(prop1), IDP_Array(prop2), idp_size_table[(int)prop1->subtype] * prop1->len);
 			}
-			else {
-				return 0;
-			}
+			return 0;
 		case IDP_GROUP:
 		{
 			IDProperty *link1, *link2;
@@ -813,9 +812,7 @@ IDProperty *IDP_New(const int type, const IDPropertyTemplate *val, const char *n
 				prop->len = prop->totallen = val->array.len;
 				break;
 			}
-			else {
-				return NULL;
-			}
+			return NULL;
 		}
 		case IDP_STRING:
 		{
@@ -911,5 +908,6 @@ void IDP_UnlinkProperty(IDProperty *prop)
 	switch (prop->type) {
 		case IDP_ID:
 			IDP_UnlinkID(prop);
+			break;
 	}
 }
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 135d847cce7..1a444d497a0 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -695,6 +695,7 @@ static ImBuf *add_ibuf_size(unsigned int width, unsigned int height, const char
 			break;
 		default:
 			BKE_image_buf_fill_color(rect, rect_float, width, height, color);
+			break;
 	}
 
 	if (rect_float) {
@@ -1120,6 +1121,7 @@ char BKE_imtype_valid_channels(const char imtype)
 		case R_IMF_IMTYPE_QUICKTIME:
 		case R_IMF_IMTYPE_DPX:
 			chan_flag |= IMA_CHAN_FLAG_ALPHA;
+			break;
 	}
 
 	/* bw */
@@ -1131,6 +1133,7 @@ char BKE_imtype_valid_channels(const char imtype)
 		case R_IMF_IMTYPE_TIFF:
 		case R_IMF_IMTYPE_IRIS:
 			chan_flag |= IMA_CHAN_FLAG_BW;
+			break;
 	}
 
 	return chan_flag;
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 4dc1e9be7ed..7eb4a3a2a8d 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1057,6 +1057,7 @@ void free_main(Main *mainvar)
 				case  32: BKE_libblock_free(lb, id); break;
 				default:
 					BLI_assert(0);
+					break;
 			}
 #endif
 		}
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 1df64431824..daa57afe14e 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1614,6 +1614,7 @@ void BKE_object_mat3_to_rot(Object *ob, float mat[3][3], bool use_compat)
 
 			if (use_compat) mat3_to_compatible_eulO(ob->rot, ob->rot, ob->rotmode, tmat);
 			else            mat3_to_eulO(ob->rot, ob->rotmode, tmat);
+			break;
 		}
 	}
 }
diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c
index f97429d7e65..11d58c945fd 100644
--- a/source/blender/blenkernel/intern/packedFile.c
+++ b/source/blender/blenkernel/intern/packedFile.c
@@ -85,6 +85,7 @@ int seekPackedFile(PackedFile *pf, int offset, int whence)
 				break;
 			default:
 				oldseek = -1;
+				break;
 		}
 		if (seek < 0) {
 			seek = 0;
@@ -448,7 +449,8 @@ char *unpackFile(ReportList *reports, const char *abs_name, const char *local_na
 					temp = local_name;
 					break;
 				}
-			/* else fall through and create it */
+				/* else create it */
+				/* fall-through */
 			case PF_WRITE_LOCAL:
 				if (writePackedFile(reports, local_name, pf, 1) == RET_OK) {
 					temp = local_name;
@@ -461,7 +463,8 @@ char *unpackFile(ReportList *reports, const char *abs_name, const char *local_na
 					temp = abs_name;
 					break;
 				}
-			/* else fall through and create it */
+				/* else create it */
+				/* fall-through */
 			case PF_WRITE_ORIGINAL:
 				if (writePackedFile(reports, abs_name, pf, 1) == RET_OK) {
 					temp = abs_name;
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 0dbe4c56a09..b47a493581e 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -139,8 +139,7 @@ Paint *BKE_paint_get_active(Scene *sce)
 				case OB_MODE_EDIT:
 					if (ts->use_uv_sculpt)
 						return &ts->uvsculpt->paint;
-					else
-						return &ts->imapaint.paint;
+					return &ts->imapaint.paint;
 			}
 		}
 
@@ -187,8 +186,7 @@ Paint *BKE_paint_get_active_from_context(const bContext *C)
 				case OB_MODE_EDIT:
 					if (ts->use_uv_sculpt)
 						return &ts->uvsculpt->paint;
-					else
-						return &ts->imapaint.paint;
+					return &ts->imapaint.paint;
 				default:
 					return &ts->imapaint.paint;
 			}
@@ -238,8 +236,7 @@ PaintMode BKE_paintmode_get_active_from_context(const bContext *C)
 				case OB_MODE_EDIT:
 					if (ts->use_uv_sculpt)
 						return PAINT_SCULPT_UV;
-					else
-						return PAINT_TEXTURE_2D;
+					return PAINT_TEXTURE_2D;
 				default:
 					return PAINT_TEXTURE_2D;
 			}
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index a300e2f2156..bc0e8f2c728 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -602,7 +602,7 @@ void BKE_rigidbody_validate_sim_constraint(RigidBodyWorld *rbw, Object *ob, shor
 					RB_constraint_set_damping_6dof_spring(rbc->physics_constraint, RB_LIMIT_LIN_Z, rbc->spring_damping_z);
 
 					RB_constraint_set_equilibrium_6dof_spring(rbc->physics_constraint);
-				/* fall through */
+					/* fall-through */
 				case RBC_TYPE_6DOF:
 					if (rbc->type == RBC_TYPE_6DOF) /* a litte awkward but avoids duplicate code for limits */
 						rbc->physics_constraint = RB_constraint_new_6dof(loc, rot, rb1, rb2);
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index aec924e15b3..c545943f15c 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -1607,6 +1607,7 @@ void txt_print_undo(Text *text)
 					c_len = BLI_str_utf8_from_unicode(uc, c);
 					c[c_len] = '\0';
 					puts(c);
+					break;
 				}
 			}
 		}
@@ -1850,6 +1851,7 @@ static unsigned int txt_undo_read_unicode(const char *undo_buf, int *undo_pos, s
 			/* should never happen */
 			BLI_assert(0);
 			unicode = 0;
+			break;
 	}
 	
 	return unicode;
@@ -1925,6 +1927,7 @@ static unsigned int txt_redo_read_unicode(const char *undo_buf, int *undo_pos, s
 			/* should never happen */
 			BLI_assert(0);
 			unicode = 0;
+			break;
 	}
 	
 	return unicode;
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 110d67b3d47..538c98cc899 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -877,6 +877,7 @@ static int start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty, Report
 			break;
 		case FFMPEG_MP3:
 			fmt->audio_codec = CODEC_ID_MP3;
+			/* fall-through */
 		case FFMPEG_WAV:
 			fmt->video_codec = CODEC_ID_NONE;
 			break;
-- 
cgit v1.2.3