fix for some pedantic warnings.

7 files changed, 80 insertions, 80 deletions

diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index d9144469917..e86a4a5febd 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -56,7 +56,7 @@ typedef struct bMotionPathVert {
 /* bMotionPathVert->flag */
 typedef enum eMotionPathVert_Flag {
 		/* vert is selected */
-	MOTIONPATH_VERT_SEL		= (1<<0),
+	MOTIONPATH_VERT_SEL		= (1<<0)
 } eMotionPathVert_Flag;
 
 /* ........ */
@@ -79,7 +79,7 @@ typedef enum eMotionPath_Flag {
 		/* (for bones) path represents the head of the bone */
 	MOTIONPATH_FLAG_BHEAD		= (1<<0),
 		/* motion path is being edited */
-	MOTIONPATH_FLAG_EDIT		= (1<<1),
+	MOTIONPATH_FLAG_EDIT		= (1<<1)
 } eMotionPath_Flag;
 
 /* Visualisation General --------------------------- */
@@ -114,7 +114,7 @@ typedef struct bAnimVizSettings {
 /* bAnimVizSettings->recalc */
 typedef enum eAnimViz_RecalcFlags {
 		/* motionpaths need recalculating */
-	ANIMVIZ_RECALC_PATHS	= (1<<0),
+	ANIMVIZ_RECALC_PATHS	= (1<<0)
 } eAnimViz_RecalcFlags;
 
 
@@ -127,13 +127,13 @@ typedef enum eOnionSkin_Types {
 		/* show ghosts within the specified frame range */
 	GHOST_TYPE_RANGE,
 		/* show ghosts on keyframes within the specified range only */
-	GHOST_TYPE_KEYS,
+	GHOST_TYPE_KEYS
 } eOnionSkin_Types;
 
 /* bAnimVizSettings->ghost_flag */
 typedef enum eOnionSkin_Flag {
 		/* only show selected bones in ghosts */
-	GHOST_FLAG_ONLYSEL 	= (1<<0),
+	GHOST_FLAG_ONLYSEL 	= (1<<0)
 } eOnionSkin_Flag;
 
 
@@ -142,7 +142,7 @@ typedef enum eMotionPaths_Types {
 		/* show the paths along their entire ranges */
 	MOTIONPATH_TYPE_RANGE = 0,
 		/* only show the parts of the paths around the current frame */
-	MOTIONPATH_TYPE_ACFRA,
+	MOTIONPATH_TYPE_ACFRA
 } eMotionPath_Types;
 
 /* bAnimVizSettings->path_viewflag */
@@ -154,7 +154,7 @@ typedef enum eMotionPaths_ViewFlag {
 		/* show keyframe/frame numbers */
 	MOTIONPATH_VIEW_KFNOS		= (1<<2),
 		/* find keyframes in whole action (instead of just in matching group name) */
-	MOTIONPATH_VIEW_KFACT		= (1<<3),
+	MOTIONPATH_VIEW_KFACT		= (1<<3)
 } eMotionPath_ViewFlag;
 
 /* bAnimVizSettings->path_bakeflag */
@@ -164,7 +164,7 @@ typedef enum eMotionPaths_BakeFlag {
 		/* for bones - calculate head-points for curves instead of tips */
 	MOTIONPATH_BAKE_HEADS			= (1<<1),
 		/* motion paths exist for AnimVizSettings instance - set when calc for first time, and unset when clearing */
-	MOTIONPATH_BAKE_HAS_PATHS		= (1<<2),
+	MOTIONPATH_BAKE_HAS_PATHS		= (1<<2)
 } eMotionPath_BakeFlag;
 
 /* ************************************************ */
@@ -260,7 +260,7 @@ typedef enum ePchan_Flag {
 		/* has Spline IK */
 	POSE_HAS_IKS	= 	(1<<14),
 		/* spline IK solving */
-	POSE_IKSPLINE	= 	(1<<15),
+	POSE_IKSPLINE	= 	(1<<15)
 } ePchan_Flag;
 
 /* PoseChannel constflag (constraint detection) */
@@ -273,7 +273,7 @@ typedef enum ePchan_ConstFlag {
 		/* only for drawing Posemode too */
 	PCHAN_HAS_STRIDE	= (1<<4),
 		/* spline IK */
-	PCHAN_HAS_SPLINEIK	= (1<<5),
+	PCHAN_HAS_SPLINEIK	= (1<<5)
 } ePchan_ConstFlag;
 
 /* PoseChannel->ikflag */
@@ -291,7 +291,7 @@ typedef enum ePchan_IkFlag {
 
 	BONE_IK_NO_XDOF_TEMP = (1<<10),
 	BONE_IK_NO_YDOF_TEMP = (1<<11),
-	BONE_IK_NO_ZDOF_TEMP = (1<<12),
+	BONE_IK_NO_ZDOF_TEMP = (1<<12)
 } ePchan_IkFlag;
 
 /* PoseChannel->rotmode and Object->rotmode */
@@ -361,7 +361,7 @@ typedef enum ePose_Flags {
 		/* set by armature_rebuild_pose to give a chance to the IK solver to rebuild IK tree */
 	POSE_WAS_REBUILT = (1<<5),
 		/* set by game_copy_pose to indicate that this pose is used in the game engine */
-	POSE_GAME_ENGINE = (1<<6),
+	POSE_GAME_ENGINE = (1<<6)
 } ePose_Flags;
 
 /* IK Solvers ------------------------------------ */
@@ -369,7 +369,7 @@ typedef enum ePose_Flags {
 /* bPose->iksolver and bPose->ikparam->iksolver */
 typedef enum ePose_IKSolverType {
 	IKSOLVER_LEGACY = 0,
-	IKSOLVER_ITASC,
+	IKSOLVER_ITASC
 } ePose_IKSolverType;
 
 /* header for all bPose->ikparam structures */
@@ -398,7 +398,7 @@ typedef enum eItasc_Flags {
 	ITASC_AUTO_STEP = (1<<0),
 	ITASC_INITIAL_REITERATION = (1<<1),
 	ITASC_REITERATION = (1<<2),
-	ITASC_SIMULATION = (1<<3),
+	ITASC_SIMULATION = (1<<3)
 } eItasc_Flags;
 
 /* bItasc->solver */
@@ -493,7 +493,7 @@ typedef enum eAction_Flags {
 		/* flags for evaluation/editing */
 	ACT_MUTED		= (1<<9),
 	ACT_PROTECTED	= (1<<10),
-	ACT_DISABLED	= (1<<11),
+	ACT_DISABLED	= (1<<11)
 } eAction_Flags;
 
 
@@ -550,12 +550,12 @@ typedef enum eDopeSheet_FilterFlag {
 	ADS_FILTER_INCL_HIDDEN		= (1<<26),	/* include 'hidden' channels too (i.e. those from hidden Objects/Bones) */
 	
 		/* combination filters (some only used at runtime) */
-	ADS_FILTER_NOOBDATA = (ADS_FILTER_NOCAM|ADS_FILTER_NOMAT|ADS_FILTER_NOLAM|ADS_FILTER_NOCUR|ADS_FILTER_NOPART|ADS_FILTER_NOARM),
+	ADS_FILTER_NOOBDATA = (ADS_FILTER_NOCAM|ADS_FILTER_NOMAT|ADS_FILTER_NOLAM|ADS_FILTER_NOCUR|ADS_FILTER_NOPART|ADS_FILTER_NOARM)
 } eDopeSheet_FilterFlag;	
 
 /* DopeSheet general flags */
 typedef enum eDopeSheet_Flag {
-	ADS_FLAG_SUMMARY_COLLAPSED	= (1<<0),	/* when summary is shown, it is collapsed, so all other channels get hidden */
+	ADS_FLAG_SUMMARY_COLLAPSED	= (1<<0)	/* when summary is shown, it is collapsed, so all other channels get hidden */
 } eDopeSheet_Flag;
 
 
@@ -604,7 +604,7 @@ typedef enum eSAction_Flag {
 		/* don't perform realtime updates */
 	SACTION_NOREALTIMEUPDATES =	(1<<10),
 		/* move markers as well as keyframes */
-	SACTION_MARKERS_MOVE = (1<<11),
+	SACTION_MARKERS_MOVE = (1<<11)
 } eSAction_Flag;	
 
 /* SpaceAction Mode Settings */
@@ -616,7 +616,7 @@ typedef enum eAnimEdit_Context {
 		/* editing of gpencil data */
 	SACTCONT_GPENCIL,
 		/* dopesheet (default) */
-	SACTCONT_DOPESHEET,
+	SACTCONT_DOPESHEET
 } eAnimEdit_Context;
 
 /* SpaceAction AutoSnap Settings (also used by other Animation Editors) */
@@ -628,7 +628,7 @@ typedef enum eAnimEdit_AutoSnap {
 		/* snap to actual frames/seconds (nla-action time) */
 	SACTSNAP_FRAME,
 		/* snap to nearest marker */
-	SACTSNAP_MARKER,
+	SACTSNAP_MARKER
 } eAnimEdit_AutoSnap;
 
 
@@ -667,7 +667,7 @@ typedef enum ACHAN_FLAG {
 	ACHAN_EXPANDED 	= (1<<4),
 	ACHAN_SHOWIPO	= (1<<5),
 	ACHAN_SHOWCONS 	= (1<<6),
-	ACHAN_MOVED     = (1<<31),
+	ACHAN_MOVED     = (1<<31)
 } ACHAN_FLAG; 
 
 #endif
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h
index 498ecdcd183..1cd916892de 100644
--- a/source/blender/makesdna/DNA_anim_types.h
+++ b/source/blender/makesdna/DNA_anim_types.h
@@ -88,7 +88,7 @@ typedef enum eFModifier_Flags {
 		/* modifier is active one (in UI) for editing purposes */
 	FMODIFIER_FLAG_ACTIVE		= (1<<2),
 		/* user wants modifier to be skipped */
-	FMODIFIER_FLAG_MUTED		= (1<<3),
+	FMODIFIER_FLAG_MUTED		= (1<<3)
 } eFModifier_Flags; 
 
 /* --- */
@@ -109,7 +109,7 @@ typedef struct FMod_Generator {
 /* generator modes */
 typedef enum eFMod_Generator_Modes {
 	FCM_GENERATOR_POLYNOMIAL	= 0,
-	FCM_GENERATOR_POLYNOMIAL_FACTORISED,
+	FCM_GENERATOR_POLYNOMIAL_FACTORISED
 } eFMod_Generator_Modes;
 
 
@@ -118,7 +118,7 @@ typedef enum eFMod_Generator_Modes {
  */
 typedef enum eFMod_Generator_Flags {
 		/* generator works in conjunction with other modifiers (i.e. doesn't replace those before it) */
-	FCM_GENERATOR_ADDITIVE	= (1<<0),
+	FCM_GENERATOR_ADDITIVE	= (1<<0)
 } eFMod_Generator_Flags;
 
 
@@ -149,7 +149,7 @@ typedef enum eFMod_Generator_Functions {
 	FCM_GENERATOR_FN_TAN,
 	FCM_GENERATOR_FN_SQRT,
 	FCM_GENERATOR_FN_LN,
-	FCM_GENERATOR_FN_SINC,
+	FCM_GENERATOR_FN_SINC
 } eFMod_Generator_Functions;
 
 
@@ -186,7 +186,7 @@ typedef enum eFMod_Cycling_Modes {
 	FCM_EXTRAPOLATE_NONE = 0,			/* don't do anything */
 	FCM_EXTRAPOLATE_CYCLIC,				/* repeat keyframe range as-is */
 	FCM_EXTRAPOLATE_CYCLIC_OFFSET,		/* repeat keyframe range, but with offset based on gradient between values */
-	FCM_EXTRAPOLATE_MIRROR,				/* alternate between forward and reverse playback of keyframe range */
+	FCM_EXTRAPOLATE_MIRROR				/* alternate between forward and reverse playback of keyframe range */
 } eFMod_Cycling_Modes;
 
 
@@ -209,7 +209,7 @@ typedef enum eFMod_Limit_Flags {
 	FCM_LIMIT_XMIN		= (1<<0),
 	FCM_LIMIT_XMAX		= (1<<1),
 	FCM_LIMIT_YMIN		= (1<<2),
-	FCM_LIMIT_YMAX		= (1<<3),
+	FCM_LIMIT_YMAX		= (1<<3)
 } eFMod_Limit_Flags;
 
 
@@ -229,7 +229,7 @@ typedef enum eFMod_Noise_Modifications {
 	FCM_NOISE_MODIF_REPLACE = 0,	/* Modify existing curve, matching it's shape */
 	FCM_NOISE_MODIF_ADD,			/* Add noise to the curve */
 	FCM_NOISE_MODIF_SUBTRACT,		/* Subtract noise from the curve */
-	FCM_NOISE_MODIF_MULTIPLY,		/* Multiply the curve by noise */
+	FCM_NOISE_MODIF_MULTIPLY		/* Multiply the curve by noise */
 } eFMod_Noise_Modifications;
 
 
@@ -379,7 +379,7 @@ typedef enum eDriver_Types {
 		/* smallest value */
 	DRIVER_TYPE_MIN,
 		/* largest value */
-	DRIVER_TYPE_MAX,
+	DRIVER_TYPE_MAX
 } eDriver_Types;
 
 /* driver flags */
@@ -396,7 +396,7 @@ typedef enum eDriver_Flags {
 		/* the names are cached so they dont need have python unicode versions created each time */
 	DRIVER_FLAG_RENAMEVAR	= (1<<4),
 		/* intermediate values of driver should be shown in the UI for debugging purposes */
-	DRIVER_FLAG_SHOWDEBUG	= (1<<5),
+	DRIVER_FLAG_SHOWDEBUG	= (1<<5)
 } eDriver_Flags;
 
 /* F-Curves -------------------------------------- */
@@ -467,20 +467,20 @@ typedef enum eFCurve_Flags {
 	FCURVE_DISCRETE_VALUES	= (1<<12),
 	
 		/* temporary tag for editing */
-	FCURVE_TAGGED			= (1<<15),
+	FCURVE_TAGGED			= (1<<15)
 } eFCurve_Flags;
 
 /* extrapolation modes (only simple value 'extending') */
 typedef enum eFCurve_Extend {
 	FCURVE_EXTRAPOLATE_CONSTANT	= 0,	/* just extend min/max keyframe value  */
-	FCURVE_EXTRAPOLATE_LINEAR,			/* just extend gradient of segment between first segment keyframes */
+	FCURVE_EXTRAPOLATE_LINEAR			/* just extend gradient of segment between first segment keyframes */
 } eFCurve_Extend;
 
 /* curve coloring modes */
 typedef enum eFCurve_Coloring {
 	FCURVE_COLOR_AUTO_RAINBOW = 0,		/* automatically determine color using rainbow (calculated at drawtime) */
 	FCURVE_COLOR_AUTO_RGB,				/* automatically determine color using XYZ (array index) <-> RGB */
-	FCURVE_COLOR_CUSTOM,				/* custom color */
+	FCURVE_COLOR_CUSTOM					/* custom color */
 } eFCurve_Coloring;
 
 /* ************************************************ */
@@ -575,7 +575,7 @@ typedef enum eNlaStrip_Blend_Mode {
 	NLASTRIP_MODE_REPLACE = 0,
 	NLASTRIP_MODE_ADD,
 	NLASTRIP_MODE_SUBTRACT,
-	NLASTRIP_MODE_MULTIPLY,
+	NLASTRIP_MODE_MULTIPLY
 } eNlaStrip_Blend_Mode;
 
 /* NLA Strip Extrpolation Mode */
@@ -585,7 +585,7 @@ typedef enum eNlaStrip_Extrapolate_Mode {
 		/* only hold+extend last frame */
 	NLASTRIP_EXTEND_HOLD_FORWARD,	
 		/* don't contribute at all */
-	NLASTRIP_EXTEND_NOTHING,
+	NLASTRIP_EXTEND_NOTHING
 } eNlaStrip_Extrapolate_Mode;
 
 /* NLA Strip Settings */
@@ -622,7 +622,7 @@ typedef enum eNlaStrip_Flag {
 	/* temporary editing flags */
 		/* NLA-Strip is really just a temporary meta used to facilitate easier transform code */
 	NLASTRIP_FLAG_TEMP_META		= (1<<30),
-	NLASTRIP_FLAG_EDIT_TOUCHED	= (1<<31),
+	NLASTRIP_FLAG_EDIT_TOUCHED	= (1<<31)
 } eNlaStrip_Flag;
 
 /* NLA Strip Type */
@@ -632,7 +632,7 @@ typedef enum eNlaStrip_Type {
 		/* 'transition' - blends between the adjacent strips */
 	NLASTRIP_TYPE_TRANSITION,
 		/* 'meta' - a strip which acts as a container for a few others */
-	NLASTRIP_TYPE_META,
+	NLASTRIP_TYPE_META
 } eNlaStrip_Type;
 
 /* NLA Tracks ------------------------------------- */
@@ -669,7 +669,7 @@ typedef enum eNlaTrack_Flag {
 	NLATRACK_PROTECTED	= (1<<4),
 	
 		/* track is not allowed to execute, usually as result of tweaking being enabled (internal flag) */
-	NLATRACK_DISABLED	= (1<<10),
+	NLATRACK_DISABLED	= (1<<10)
 } eNlaTrack_Flag;
 
 
@@ -705,7 +705,7 @@ typedef struct KS_Path {
 /* KS_Path->flag */
 typedef enum eKSP_Settings {
 		/* entire array (not just the specified index) gets keyframed */
-	KSP_FLAG_WHOLE_ARRAY	= (1<<0),
+	KSP_FLAG_WHOLE_ARRAY	= (1<<0)
 } eKSP_Settings;
 
 /* KS_Path->groupmode */
@@ -719,7 +719,7 @@ typedef enum eKSP_Grouping {
 		/* path should be grouped using name of inner-most context item from templates 
 		 * 	- this is most useful for relative KeyingSets only
 		 */
-	KSP_GROUP_TEMPLATE_ITEM,
+	KSP_GROUP_TEMPLATE_ITEM
 } eKSP_Grouping;
 
 /* KS_Path->templates  (Template Flags)
@@ -736,7 +736,7 @@ typedef enum eKSP_TemplateTypes {
 	KSP_TEMPLATE_NODE		 	= (1<<3),	/* #nod - selected node */
 	KSP_TEMPLATE_MODIFIER		= (1<<4),	/* #mod - active only */
 	
-	KSP_TEMPLATE_ROT		= (1<<16),	/* modify rotation paths based on rotation mode of Object or Pose Channel */
+	KSP_TEMPLATE_ROT			= (1<<16)	/* modify rotation paths based on rotation mode of Object or Pose Channel */
 } eKSP_TemplateTypes;
 
 /* ---------------- */
@@ -770,7 +770,7 @@ typedef enum eKS_Settings {
 		/* keyingset cannot be removed (and doesn't need to be freed) */
 	KEYINGSET_BUILTIN		= (1<<0),
 		/* keyingset does not depend on context info (i.e. paths are absolute) */
-	KEYINGSET_ABSOLUTE		= (1<<1),
+	KEYINGSET_ABSOLUTE		= (1<<1)
 } eKS_Settings;
 
 /* Flags for use by keyframe creation/deletion calls */
@@ -780,7 +780,7 @@ typedef enum eInsertKeyFlags {
 	INSERTKEY_FAST 		= (1<<2),	/* don't recalculate handles,etc. after adding key */
 	INSERTKEY_FASTR		= (1<<3),	/* don't realloc mem (or increase count, as array has already been set out) */
 	INSERTKEY_REPLACE 	= (1<<4),	/* only replace an existing keyframe (this overrides INSERTKEY_NEEDED) */
-	INSERTKEY_XYZ2RGB	= (1<<5),	/* transform F-Curves should have XYZ->RGB color mode */
+	INSERTKEY_XYZ2RGB	= (1<<5)	/* transform F-Curves should have XYZ->RGB color mode */
 } eInsertKeyFlags;
 
 /* ************************************************ */
@@ -877,14 +877,14 @@ typedef enum eAnimData_Flag {
 	ADT_UI_ACTIVE			= (1<<15),
 	
 		/* F-Curves from this AnimData block are not visible in the Graph Editor */
-	ADT_CURVES_NOT_VISIBLE	= (1<<16),
+	ADT_CURVES_NOT_VISIBLE	= (1<<16)
 } eAnimData_Flag;
 
 /* Animation Data recalculation settings (to be set by depsgraph) */
 typedef enum eAnimData_Recalc {
 	ADT_RECALC_DRIVERS		= (1<<0),
 	ADT_RECALC_ANIM			= (1<<1),
-	ADT_RECALC_ALL			= (ADT_RECALC_DRIVERS|ADT_RECALC_ANIM),
+	ADT_RECALC_ALL			= (ADT_RECALC_DRIVERS|ADT_RECALC_ANIM)
 } eAnimData_Recalc;
 
 /* Base Struct for Anim ------------------------------------- */
diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h
index b244d8277a7..a9f6beb8638 100644
--- a/source/blender/makesdna/DNA_armature_types.h
+++ b/source/blender/makesdna/DNA_armature_types.h
@@ -180,7 +180,7 @@ typedef enum eBone_Flag {
 	BONE_EDITMODE_LOCKED		= (1<<19),	/* bone transforms are locked in EditMode */
 	BONE_TRANSFORM_CHILD		= (1<<20),	/* Indicates that a parent is also being transformed */
 	BONE_UNSELECTABLE			= (1<<21),	/* bone cannot be selected */
-	BONE_NO_LOCAL_LOCATION		= (1<<22),	/* bone location is in armature space */
+	BONE_NO_LOCAL_LOCATION		= (1<<22)	/* bone location is in armature space */
 } eBone_Flag;
 
 #endif
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index dbd9be14c0e..e039eed2065 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -94,7 +94,7 @@ typedef struct bConstraintTarget {
 
 /* bConstraintTarget -> flag */
 typedef enum B_CONSTRAINT_TARGET_FLAG {
-	CONSTRAINT_TAR_TEMP = (1<<0),		/* temporary target-struct that needs to be freed after use */
+	CONSTRAINT_TAR_TEMP = (1<<0)		/* temporary target-struct that needs to be freed after use */
 } B_CONSTRAINT_TARGET_FLAG;
 
 /* bConstraintTarget/bConstraintOb -> type */
@@ -476,7 +476,7 @@ typedef enum eBConstraint_SpaceTypes {
 		 /* for posechannels - local with parent  */
 	CONSTRAINT_SPACE_PARLOCAL, /* = 3 */
 		/* for files from between 2.43-2.46 (should have been parlocal) */
-	CONSTRAINT_SPACE_INVALID, /* = 4. do not exchange for anything! */
+	CONSTRAINT_SPACE_INVALID /* = 4. do not exchange for anything! */
 } eBConstraint_SpaceTypes;
 
 /* bConstraintChannel.flag */
@@ -496,7 +496,7 @@ typedef enum eCopyRotation_Flags {
 	ROTLIKE_X_INVERT	= (1<<4),
 	ROTLIKE_Y_INVERT	= (1<<5),
 	ROTLIKE_Z_INVERT 	= (1<<6),
-	ROTLIKE_OFFSET		= (1<<7),
+	ROTLIKE_OFFSET		= (1<<7)
 } eCopyRotation_Flags;
 
 /* bLocateLikeConstraint.flag */
@@ -509,7 +509,7 @@ typedef enum eCopyLocation_Flags {
 	LOCLIKE_X_INVERT	= (1<<4),
 	LOCLIKE_Y_INVERT	= (1<<5),
 	LOCLIKE_Z_INVERT	= (1<<6),
-	LOCLIKE_OFFSET		= (1<<7),
+	LOCLIKE_OFFSET		= (1<<7)
 } eCopyLocation_Flags;
  
 /* bSizeLikeConstraint.flag */
@@ -517,28 +517,28 @@ typedef enum eCopyScale_Flags {
 	SIZELIKE_X		= (1<<0),
 	SIZELIKE_Y		= (1<<1),
 	SIZELIKE_Z		= (1<<2), 
-	SIZELIKE_OFFSET = (1<<3),
+	SIZELIKE_OFFSET = (1<<3)
 } eCopyScale_Flags;
 
 /* bSameVolumeConstraint.flag */
 typedef enum eSameVolume_Modes {
 	SAMEVOL_X		= 0,
 	SAMEVOL_Y,
-	SAMEVOL_Z, 
+	SAMEVOL_Z
 } eSameVolume_Modes;
 
 /* Locked-Axis Values (Locked Track) */
 typedef enum eLockAxis_Modes {
 	LOCK_X	= 0,
 	LOCK_Y,
-	LOCK_Z,
+	LOCK_Z
 } eLockAxis_Modes;
 
 /* Up-Axis Values (TrackTo and Locked Track) */
 typedef enum eUpAxis_Modes {
 	UP_X	= 0,
 	UP_Y,
-	UP_Z,
+	UP_Z
 } eUpAxis_Modes;
 
 /* Tracking axis (TrackTo, Locked Track, Damped Track) */
@@ -548,19 +548,19 @@ typedef enum eTrackToAxis_Modes {
 	TRACK_Z,
 	TRACK_nX,
 	TRACK_nY,
-	TRACK_nZ,
+	TRACK_nZ
 } eTrackToAxis_Modes;
 
 /* FollowPath flags */
 typedef enum eFollowPath_Flags {
 	FOLLOWPATH_FOLLOW	= (1<<0),
 	FOLLOWPATH_STATIC	= (1<<1),
-	FOLLOWPATH_RADIUS	= (1<<2),
+	FOLLOWPATH_RADIUS	= (1<<2)
 } eFollowPath_Flags;
 
 /* bTrackToConstraint->flags */
 typedef enum eTrackTo_Flags {
-	TARGET_Z_UP 	= (1<<0),
+	TARGET_Z_UP 	= (1<<0)
 } eTrackTo_Flags;
 
 /* Strech To Constraint -> volmode */
@@ -568,14 +568,14 @@ typedef enum eStretchTo_VolMode {
 	VOLUME_XZ	= 0,
 	VOLUME_X,
 	VOLUME_Z,
-	NO_VOLUME,
+	NO_VOLUME
 } eStretchTo_VolMode;
 
 /* Stretch To Constraint -> plane mode */
 typedef enum eStretchTo_PlaneMode {
 	PLANE_X		= 0,
 	PLANE_Y,
-	PLANE_Z,
+	PLANE_Z
 } eStretchTo_PlaneMode;
 
 /* Clamp-To Constraint ->flag */
@@ -583,12 +583,12 @@ typedef enum eClampTo_Modes {
 	CLAMPTO_AUTO = 0,
 	CLAMPTO_X,
 	CLAMPTO_Y,
-	CLAMPTO_Z,
+	CLAMPTO_Z
 } eClampTo_Modes;
 
 /* ClampTo Constraint ->flag2 */
 typedef enum eClampTo_Flags {
-	CLAMPTO_CYCLIC	= (1<<0),
+	CLAMPTO_CYCLIC	= (1<<0)
 } eClampTo_Flags;
 
 /* bKinematicConstraint->flag */
@@ -611,7 +611,7 @@ typedef enum eKinematic_Flags {
 	CONSTRAINT_IK_NO_ROT_Y		= (1<<12),
 	CONSTRAINT_IK_NO_ROT_Z		= (1<<13),
 	/* axis relative to target */
-	CONSTRAINT_IK_TARGETAXIS	= (1<<14),
+	CONSTRAINT_IK_TARGETAXIS	= (1<<14)
 } eKinematic_Flags;
 
 /* bSplineIKConstraint->flag */
@@ -625,7 +625,7 @@ typedef enum eSplineIK_Flags {
 	/* evenly distribute the bones along the path regardless of length */
 	CONSTRAINT_SPLINEIK_EVENSPLITS		= (1<<3),	
 	/* don't adjust the x and z scaling of the bones by the curve radius */
-	CONSTRAINT_SPLINEIK_NO_CURVERAD	= (1<<4),
+	CONSTRAINT_SPLINEIK_NO_CURVERAD	= (1<<4)
 } eSplineIK_Flags;
 
 /* bSplineIKConstraint->xzScaleMode */
@@ -635,14 +635,14 @@ typedef enum eSplineIK_XZScaleModes {
 	/* bones in the chain should take their x/z scales from the original scaling */
 	CONSTRAINT_SPLINEIK_XZS_ORIGINAL,
 	/* x/z scales are the inverse of the y-scale */
-	CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC,
+	CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC
 } eSplineIK_XZScaleModes;
 
 /* MinMax (floor) flags */
 typedef enum eFloor_Flags {
 	MINMAX_STICKY	= (1<<0),
 	MINMAX_STUCK	= (1<<1),
-	MINMAX_USEROT	= (1<<2),
+	MINMAX_USEROT	= (1<<2)
 } eFloor_Flags;
 
 /* transform limiting constraints -> flag2 */
@@ -650,7 +650,7 @@ typedef enum eTransformLimits_Flags2 {
 	/* not used anymore - for older Limit Location constraints only */
 	LIMIT_NOPARENT 	= (1<<0),
 	/* for all Limit constraints - allow to be used during transform? */
-	LIMIT_TRANSFORM = (1<<1),
+	LIMIT_TRANSFORM = (1<<1)
 } eTransformLimits_Flags2;
 
 /* transform limiting constraints -> flag (own flags)  */
@@ -660,33 +660,33 @@ typedef enum eTransformLimits_Flags {
 	LIMIT_YMIN = (1<<2),
 	LIMIT_YMAX = (1<<3),
 	LIMIT_ZMIN = (1<<4),
-	LIMIT_ZMAX = (1<<5),
+	LIMIT_ZMAX = (1<<5)
 } eTransformLimits_Flags;
 
 /* limit rotation constraint -> flag (own flags) */
 typedef enum eRotLimit_Flags {
 	LIMIT_XROT = (1<<0),
 	LIMIT_YROT = (1<<1),
-	LIMIT_ZROT = (1<<2),
+	LIMIT_ZROT = (1<<2)
 } eRotLimit_Flags;
 
 /* distance limit constraint */
 	/* bDistLimitConstraint->flag */
 typedef enum eDistLimit_Flag {
-	LIMITDIST_USESOFT	= (1<<0),
+	LIMITDIST_USESOFT	= (1<<0)
 } eDistLimit_Flag;
 
 	/* bDistLimitConstraint->mode */
 typedef enum eDistLimit_Modes {
 	LIMITDIST_INSIDE = 0,
 	LIMITDIST_OUTSIDE,
-	LIMITDIST_ONSURFACE,
+	LIMITDIST_ONSURFACE
 } eDistLimit_Modes;
 	
 /* python constraint -> flag */
 typedef enum ePyConstraint_Flags {
 	PYCON_USETARGETS	= (1<<0),
-	PYCON_SCRIPTERROR	= (1<<1),
+	PYCON_SCRIPTERROR	= (1<<1)
 } ePyConstraint_Flags;
 
 /* ChildOf Constraint -> flag */
@@ -699,7 +699,7 @@ typedef enum eChildOf_Flags {
 	CHILDOF_ROTZ	= (1<<5),
 	CHILDOF_SIZEX	= (1<<6),
 	CHILDOF_SIZEY	= (1<<7),
-	CHILDOF_SIZEZ	= (1<<8),
+	CHILDOF_SIZEZ	= (1<<8)
 } eChildOf_Flags;
 
 /* Pivot Constraint */
@@ -720,7 +720,7 @@ typedef enum ePivotConstraint_Axis {
 	/* consider +ve y-axis rotations */
 	PIVOTCON_AXIS_Y,
 	/* consider +ve z-axis rotations */
-	PIVOTCON_AXIS_Z,
+	PIVOTCON_AXIS_Z
 } ePivotConstraint_Axis;
 
 	/* settings for Pivot Constraint in general */
@@ -728,7 +728,7 @@ typedef enum ePivotConstraint_Flag {
 	/* offset is to be interpreted as being a fixed-point in space */
 	PIVOTCON_FLAG_OFFSET_ABS	= (1<<0),
 	/* rotation-based activation uses negative rotation to drive result */
-	PIVOTCON_FLAG_ROTACT_NEG	= (1<<1),
+	PIVOTCON_FLAG_ROTACT_NEG	= (1<<1)
 } ePivotConstraint_Flag;
 
 /* Rigid-Body Constraint */
diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index ba357b575d5..7dca07e7642 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -314,21 +314,21 @@ typedef enum eBezTriple_Handle {
 	HD_AUTO,
 	HD_VECT,
 	HD_ALIGN,
-	HD_AUTO_ANIM,	/* not real handle type, but is just used as dummy item for anim code */
+	HD_AUTO_ANIM	/* not real handle type, but is just used as dummy item for anim code */
 } eBezTriple_Handle;
 
 /* interpolation modes (used only for BezTriple->ipo) */
 typedef enum eBezTriple_Interpolation {
 	BEZT_IPO_CONST = 0,	/* constant interpolation */
 	BEZT_IPO_LIN,		/* linear interpolation */
-	BEZT_IPO_BEZ,		/* bezier interpolation */
+	BEZT_IPO_BEZ		/* bezier interpolation */
 } eBezTriple_Interpolation;
 
 /* types of keyframe (used only for BezTriple->hide when BezTriple is used in F-Curves) */
 typedef enum eBezTriple_KeyframeType {
 	BEZT_KEYTYPE_KEYFRAME = 0,	/* default - 'proper' Keyframe */
 	BEZT_KEYTYPE_EXTREME,		/* 'extreme' keyframe */
-	BEZT_KEYTYPE_BREAKDOWN,		/* 'breakdown' keyframe */
+	BEZT_KEYTYPE_BREAKDOWN		/* 'breakdown' keyframe */
 } eBezTriple_KeyframeType;
 
 /* checks if the given BezTriple is selected */
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index 504694a6fab..2deb64be604 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -81,7 +81,7 @@ typedef enum ReportType {
 enum ReportListFlags {
 	RPT_PRINT = 1,
 	RPT_STORE = 2,
-	RPT_FREE = 4,
+	RPT_FREE = 4
 };
 #
 #
@@ -313,7 +313,7 @@ typedef struct wmOperator {
 typedef enum wmRadialControlMode {
 	WM_RADIALCONTROL_SIZE,
 	WM_RADIALCONTROL_STRENGTH,
-	WM_RADIALCONTROL_ANGLE,
+	WM_RADIALCONTROL_ANGLE
 } wmRadialControlMode;
 
 #endif /* DNA_WINDOWMANAGER_TYPES_H */
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 577b18556c8..359a3920528 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -244,7 +244,7 @@ int add_type(char *str, int len)
 	
 	if(nr_types>=maxnr) {
 		printf("too many types\n");
-		return nr_types-1;;
+		return nr_types-1;
 	}
 	nr_types++;