[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58407] trunk/blender/source: style cleanup: switch statements, include break statements within braces & indent.

Campbell Barton ideasman42 at gmail.com
Fri Jul 19 17:23:42 CEST 2013


Revision: 58407
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58407
Author:   campbellbarton
Date:     2013-07-19 15:23:42 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
style cleanup: switch statements, include break statements within braces & indent.
also indent case's within the switch (we already did both of these almost everywhere)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/action.c
    trunk/blender/source/blender/blenkernel/intern/armature.c
    trunk/blender/source/blender/blenkernel/intern/colortools.c
    trunk/blender/source/blender/blenkernel/intern/constraint.c
    trunk/blender/source/blender/blenkernel/intern/fcurve.c
    trunk/blender/source/blender/blenkernel/intern/fmodifier.c
    trunk/blender/source/blender/blenkernel/intern/ipo.c
    trunk/blender/source/blender/blenkernel/intern/linestyle.c
    trunk/blender/source/blender/blenkernel/intern/material.c
    trunk/blender/source/blender/blenkernel/intern/node.c
    trunk/blender/source/blender/blenkernel/intern/object.c
    trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
    trunk/blender/source/blender/blenlib/intern/DLRB_tree.c
    trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    trunk/blender/source/blender/editors/animation/anim_channels_defines.c
    trunk/blender/source/blender/editors/animation/anim_channels_edit.c
    trunk/blender/source/blender/editors/animation/anim_draw.c
    trunk/blender/source/blender/editors/animation/anim_filter.c
    trunk/blender/source/blender/editors/animation/drivers.c
    trunk/blender/source/blender/editors/animation/fmodifier_ui.c
    trunk/blender/source/blender/editors/animation/keyframes_draw.c
    trunk/blender/source/blender/editors/animation/keyframing.c
    trunk/blender/source/blender/editors/animation/keyingsets.c
    trunk/blender/source/blender/editors/armature/pose_slide.c
    trunk/blender/source/blender/editors/gpencil/drawgpencil.c
    trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
    trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
    trunk/blender/source/blender/editors/interface/view2d.c
    trunk/blender/source/blender/editors/interface/view2d_ops.c
    trunk/blender/source/blender/editors/object/object_lattice.c
    trunk/blender/source/blender/editors/object/object_relations.c
    trunk/blender/source/blender/editors/render/render_shading.c
    trunk/blender/source/blender/editors/screen/screen_ops.c
    trunk/blender/source/blender/editors/space_action/action_draw.c
    trunk/blender/source/blender/editors/space_action/action_select.c
    trunk/blender/source/blender/editors/space_clip/space_clip.c
    trunk/blender/source/blender/editors/space_graph/graph_buttons.c
    trunk/blender/source/blender/editors/space_graph/space_graph.c
    trunk/blender/source/blender/editors/space_nla/nla_buttons.c
    trunk/blender/source/blender/editors/space_nla/nla_channels.c
    trunk/blender/source/blender/editors/space_nla/nla_draw.c
    trunk/blender/source/blender/editors/space_node/node_draw.c
    trunk/blender/source/blender/editors/space_node/node_templates.c
    trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
    trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
    trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
    trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
    trunk/blender/source/blender/editors/space_time/space_time.c
    trunk/blender/source/blender/editors/space_view3d/drawarmature.c
    trunk/blender/source/blender/editors/transform/transform.c
    trunk/blender/source/blender/editors/transform/transform_constraints.c
    trunk/blender/source/blender/makesrna/intern/rna_color.c
    trunk/blender/source/blender/makesrna/intern/rna_object.c
    trunk/blender/source/blender/nodes/shader/nodes/node_shader_math.c
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
    trunk/blender/source/tools/check_style_c.py

Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c	2013-07-19 14:00:53 UTC (rev 58406)
+++ trunk/blender/source/blender/blenkernel/intern/action.c	2013-07-19 15:23:42 UTC (rev 58407)
@@ -930,9 +930,8 @@
 						if (fmd->flag & FCM_LIMIT_XMAX) {
 							max = max_ff(max, fmd->rect.xmax);
 						}
+						break;
 					}
-					break;
-						
 					case FMODIFIER_TYPE_CYCLES: /* Cycles F-Modifier */
 					{
 						FMod_Cycles *fmd = (FMod_Cycles *)fcm->data;
@@ -941,9 +940,8 @@
 							min = MINAFRAMEF;
 						if (fmd->after_mode != FCM_EXTRAPOLATE_NONE)
 							max = MAXFRAMEF;
+						break;
 					}
-					break;
-						
 					/* TODO: function modifier may need some special limits */
 						
 					default: /* all other standard modifiers are on the infinite range... */

Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c	2013-07-19 14:00:53 UTC (rev 58406)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c	2013-07-19 15:23:42 UTC (rev 58407)
@@ -2100,8 +2100,8 @@
 				/* z-axis scale */
 				scale = len_v3(pchan->pose_mat[2]);
 				mul_v3_fl(poseMat[2], scale);
+				break;
 			}
-			break;
 			case CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC:
 			{
 				/* 'volume preservation' */
@@ -2123,8 +2123,8 @@
 				/* apply the scaling */
 				mul_v3_fl(poseMat[0], scale);
 				mul_v3_fl(poseMat[2], scale);
+				break;
 			}
-			break;
 		}
 
 		/* finally, multiply the x and z scaling by the radius of the curve too,

Modified: trunk/blender/source/blender/blenkernel/intern/colortools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/colortools.c	2013-07-19 14:00:53 UTC (rev 58406)
+++ trunk/blender/source/blender/blenkernel/intern/colortools.c	2013-07-19 15:23:42 UTC (rev 58407)
@@ -328,8 +328,8 @@
 				cuma->curve[i].x = i / ((float)cuma->totpoint - 1);
 				cuma->curve[i].y = 0.5;
 			}
+			break;
 		}
-		break;
 		case CURVE_PRESET_ROUND:
 			cuma->curve[0].x = 0;
 			cuma->curve[0].y = 1;

Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c	2013-07-19 14:00:53 UTC (rev 58406)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c	2013-07-19 15:23:42 UTC (rev 58407)
@@ -132,8 +132,8 @@
 				unit_m4(cob->matrix);
 			
 			copy_m4_m4(cob->startmat, cob->matrix);
+			break;
 		}
-		break;
 		case CONSTRAINT_OBTYPE_BONE:
 		{
 			/* only set if we have valid bone, otherwise default */
@@ -158,9 +158,8 @@
 				unit_m4(cob->matrix);
 				
 			copy_m4_m4(cob->startmat, cob->matrix);
+			break;
 		}
-		break;
-			
 		default: /* other types not yet handled */
 			unit_m4(cob->matrix);
 			unit_m4(cob->startmat);
@@ -195,8 +194,8 @@
 				/* copy inverse of delta back to owner */
 				invert_m4_m4(cob->ob->constinv, delta);
 			}
+			break;
 		}
-		break;
 		case CONSTRAINT_OBTYPE_BONE:
 		{
 			/* cob->ob or cob->pchan might not exist */
@@ -207,8 +206,8 @@
 				/* copy inverse of delta back to owner */
 				invert_m4_m4(cob->pchan->constinv, delta);
 			}
+			break;
 		}
-		break;
 	}
 	
 	/* free tempolary struct */
@@ -246,8 +245,8 @@
 					/* call self with slightly different values */
 					BKE_constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to);
 				}
+				break;
 			}
-			break;
 			case CONSTRAINT_SPACE_POSE: /* ---------- FROM POSESPACE ---------- */
 			{
 				/* pose to world */
@@ -267,8 +266,8 @@
 						mul_m4_m4m4(mat, imat, mat);
 					}
 				}
+				break;
 			}
-			break;
 			case CONSTRAINT_SPACE_LOCAL: /* ------------ FROM LOCALSPACE --------- */
 			{
 				/* local to pose - do inverse procedure that was done for pose to local */
@@ -282,8 +281,8 @@
 					/* call self with slightly different values */
 					BKE_constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to);
 				}
+				break;
 			}
-			break;
 			case CONSTRAINT_SPACE_PARLOCAL: /* -------------- FROM LOCAL WITH PARENT ---------- */
 			{
 				/* local + parent to pose */
@@ -297,8 +296,8 @@
 					/* call self with slightly different values */
 					BKE_constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to);
 				}
+				break;
 			}
-			break;
 		}
 	}
 	else {
@@ -2235,8 +2234,8 @@
 					
 						/* the z axis gets mapped onto a third orthogonal vector */
 						cross_v3_v3v3(totmat[2], totmat[0], totmat[1]);
+						break;
 					}
-					break;
 					case TRACK_Z: /* LOCK X TRACK Z */
 					{
 						/* Projection of Vector on the plane */
@@ -2249,8 +2248,8 @@
 					
 						/* the z axis gets mapped onto a third orthogonal vector */
 						cross_v3_v3v3(totmat[1], totmat[2], totmat[0]);
+						break;
 					}
-					break;
 					case TRACK_nY: /* LOCK X TRACK -Y */
 					{
 						/* Projection of Vector on the plane */
@@ -2264,8 +2263,8 @@
 					
 						/* the z axis gets mapped onto a third orthogonal vector */
 						cross_v3_v3v3(totmat[2], totmat[0], totmat[1]);
+						break;
 					}
-					break;
 					case TRACK_nZ: /* LOCK X TRACK -Z */
 					{
 						/* Projection of Vector on the plane */
@@ -2279,16 +2278,16 @@
 						
 						/* the z axis gets mapped onto a third orthogonal vector */
 						cross_v3_v3v3(totmat[1], totmat[2], totmat[0]);
+						break;
 					}
-					break;
 					default:
 					{
 						unit_m3(totmat);
+						break;
 					}
-					break;
 				}
+				break;
 			}
-			break;
 			case LOCK_Y: /* LOCK Y */
 			{
 				switch (data->trackflag) {
@@ -2304,8 +2303,8 @@
 
 						/* the z axis gets mapped onto a third orthogonal vector */
 						cross_v3_v3v3(totmat[2], totmat[0], totmat[1]);
+						break;
 					}
-					break;
 					case TRACK_Z: /* LOCK Y TRACK Z */
 					{
 						/* Projection of Vector on the plane */
@@ -2318,8 +2317,8 @@
 					
 						/* the z axis gets mapped onto a third orthogonal vector */
 						cross_v3_v3v3(totmat[0], totmat[1], totmat[2]);
+						break;
 					}
-					break;
 					case TRACK_nX: /* LOCK Y TRACK -X */
 					{
 						/* Projection of Vector on the plane */
@@ -2333,8 +2332,8 @@
 					
 						/* the z axis gets mapped onto a third orthogonal vector */
 						cross_v3_v3v3(totmat[2], totmat[0], totmat[1]);
+						break;
 					}
-					break;
 					case TRACK_nZ: /* LOCK Y TRACK -Z */
 					{
 						/* Projection of Vector on the plane */
@@ -2348,16 +2347,16 @@
 					
 						/* the z axis gets mapped onto a third orthogonal vector */
 						cross_v3_v3v3(totmat[0], totmat[1], totmat[2]);
+						break;
 					}
-					break;
 					default:
 					{
 						unit_m3(totmat);
+						break;
 					}
-					break;
 				}
+				break;
 			}
-			break;
 			case LOCK_Z: /* LOCK Z */
 			{
 				switch (data->trackflag) {
@@ -2373,8 +2372,8 @@
 					
 						/* the x axis gets mapped onto a third orthogonal vector */
 						cross_v3_v3v3(totmat[1], totmat[2], totmat[0]);
+						break;
 					}
-					break;
 					case TRACK_Y: /* LOCK Z TRACK Y */
 					{
 						/* Projection of Vector on the plane */
@@ -2387,8 +2386,8 @@
 						
 						/* the x axis gets mapped onto a third orthogonal vector */
 						cross_v3_v3v3(totmat[0], totmat[1], totmat[2]);
+						break;
 					}
-					break;
 					case TRACK_nX: /* LOCK Z TRACK -X */
 					{
 						/* Projection of Vector on the plane */
@@ -2402,8 +2401,8 @@
 					
 						/* the x axis gets mapped onto a third orthogonal vector */
 						cross_v3_v3v3(totmat[1], totmat[2], totmat[0]);
+						break;
 					}
-					break;
 					case TRACK_nY: /* LOCK Z TRACK -Y */
 					{
 						/* Projection of Vector on the plane */
@@ -2417,21 +2416,21 @@
 						
 						/* the x axis gets mapped onto a third orthogonal vector */
 						cross_v3_v3v3(totmat[0], totmat[1], totmat[2]);
+						break;
 					}
-					break;
 					default:
 					{
 						unit_m3(totmat);
+						break;
 					}
-					break;
 				}
+				break;
 			}
-			break;
 			default:
 			{
 				unit_m3(totmat);
+				break;
 			}
-			break;
 		}
 		/* Block to keep matrix heading */
 		copy_m3_m4(tmpmat, cob->matrix);
@@ -4414,8 +4413,8 @@
 				con->ownspace = CONSTRAINT_SPACE_POSE;
 				con->flag |= CONSTRAINT_SPACEONCE;
 			}
+			break;
 		}
-		break;
 	}
 	
 	return con;
@@ -4640,8 +4639,8 @@
 					unit_m4(cob->matrix);
 					unit_m4(cob->startmat);
 				}
+				break;
 			}
-			break;
 			case CONSTRAINT_OBTYPE_BONE: /* this may occur in some cases */
 			{
 				cob->ob = NULL; /* this might not work at all :/ */
@@ -4654,8 +4653,8 @@
 					unit_m4(cob->matrix);
 					unit_m4(cob->startmat);
 				}
+				break;
 			}
-			break;
 		}
 		
 		/* get targets - we only need the first one though (and there should only be one) */

Modified: trunk/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fcurve.c	2013-07-19 14:00:53 UTC (rev 58406)
+++ trunk/blender/source/blender/blenkernel/intern/fcurve.c	2013-07-19 15:23:42 UTC (rev 58407)
@@ -667,17 +667,16 @@
 					
 					if ((data->flag & FCM_GENERATOR_ADDITIVE) == 0)
 						return 0;
+					break;
 				}
-				break;
 				case FMODIFIER_TYPE_FN_GENERATOR:
 				{
 					FMod_FunctionGenerator *data = (FMod_FunctionGenerator *)fcm->data;
 					
 					if ((data->flag & FCM_GENERATOR_ADDITIVE) == 0)
 						return 0;
+					break;
 				}
-				break;
-					
 				/* always harmful - cannot allow */
 				default:
 					return 0;
@@ -1703,9 +1702,8 @@
 				else
 					driver->curval = value;
 			}
+			break;
 		}
-		break;
-			
 		case DRIVER_TYPE_MIN: /* smallest value */
 		case DRIVER_TYPE_MAX: /* largest value */
 		{
@@ -1738,9 +1736,8 @@
 			
 			/* store value in driver */
 			driver->curval = value;
+			break;
 		}
-		break;
-			
 		case DRIVER_TYPE_PYTHON: /* expression */
 		{
 #ifdef WITH_PYTHON
@@ -1759,9 +1756,8 @@
 #else /* WITH_PYTHON*/
 			(void)evaltime;
 #endif /* WITH_PYTHON*/
+			break;
 		}
-		break;
-		
 		default:
 		{
 			/* special 'hack' - just use stored value 

Modified: trunk/blender/source/blender/blenkernel/intern/fmodifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fmodifier.c	2013-07-19 14:00:53 UTC (rev 58406)
+++ trunk/blender/source/blender/blenkernel/intern/fmodifier.c	2013-07-19 15:23:42 UTC (rev 58407)
@@ -213,9 +213,8 @@

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list