Cleanup: spaces around operators in DNA headers

18 files changed, 306 insertions, 306 deletions

diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index ddea6f64dba..b17a746f11c 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -699,7 +699,7 @@ typedef struct bDopeSheet {
 	/** Standard flags. */
 	int flag;
 
-	/** Index+1 of channel to rename - only gets set by renaming operator. */
+	/** `index + 1` of channel to rename - only gets set by renaming operator. */
 	int renameIndex;
 } bDopeSheet;
 
@@ -833,11 +833,11 @@ typedef enum eSAction_Flag {
 	/* draw time in seconds instead of time in frames */
 	SACTION_DRAWTIME = (1 << 2),
 	/* don't filter action channels according to visibility */
-	//SACTION_NOHIDE = (1<<3), // XXX deprecated... old animation system
+	//SACTION_NOHIDE = (1 << 3), // XXX deprecated... old animation system
 	/* don't kill overlapping keyframes after transform */
 	SACTION_NOTRANSKEYCULL = (1 << 4),
 	/* don't include keyframes that are out of view */
-	//SACTION_HORIZOPTIMISEON = (1<<5), // XXX deprecated... old irrelevant trick
+	//SACTION_HORIZOPTIMISEON = (1 << 5), // XXX deprecated... old irrelevant trick
 	/* show pose-markers (local to action) in Action Editor mode  */
 	SACTION_POSEMARKERS_SHOW = (1 << 6),
 	/* don't draw action channels using group colors (where applicable) */
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h
index 6cc4ae4078d..ccc0b2e4fcb 100644
--- a/source/blender/makesdna/DNA_anim_types.h
+++ b/source/blender/makesdna/DNA_anim_types.h
@@ -140,7 +140,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;
 
 
@@ -301,9 +301,9 @@ typedef struct FMod_Stepped {
 /* stepped modifier range flags */
 typedef enum eFMod_Stepped_Flags {
 	/** Don't affect frames before the start frame. */
-	FCM_STEPPED_NO_BEFORE 	= (1<<0),
+	FCM_STEPPED_NO_BEFORE 	= (1 << 0),
 	/** Don't affect frames after the end frame. */
-	FCM_STEPPED_NO_AFTER 	= (1<<1),
+	FCM_STEPPED_NO_AFTER 	= (1 << 1),
 } eFMod_Stepped_Flags;
 
 /* Drivers -------------------------------------- */
@@ -604,31 +604,31 @@ typedef struct FCurve {
 /* user-editable flags/settings */
 typedef enum eFCurve_Flags {
 	/** curve/keyframes are visible in editor */
-	FCURVE_VISIBLE		= (1<<0),
+	FCURVE_VISIBLE		= (1 << 0),
 	/** curve is selected for editing  */
-	FCURVE_SELECTED 	= (1<<1),
+	FCURVE_SELECTED 	= (1 << 1),
 	/** curve is active one */
-	FCURVE_ACTIVE		= (1<<2),
+	FCURVE_ACTIVE		= (1 << 2),
 	/** keyframes (beztriples) cannot be edited */
-	FCURVE_PROTECTED	= (1<<3),
+	FCURVE_PROTECTED	= (1 << 3),
 	/** fcurve will not be evaluated for the next round */
-	FCURVE_MUTED		= (1<<4),
+	FCURVE_MUTED		= (1 << 4),
 
 	/** fcurve uses 'auto-handles', which stay horizontal... */
 	// DEPRECATED
-	FCURVE_AUTO_HANDLES	= (1<<5),
-	FCURVE_MOD_OFF		= (1<<6),
+	FCURVE_AUTO_HANDLES	= (1 << 5),
+	FCURVE_MOD_OFF		= (1 << 6),
 	/** skip evaluation, as RNA-path cannot be resolved
 	 * (similar to muting, but cannot be set by user) */
-	FCURVE_DISABLED			= (1<<10),
+	FCURVE_DISABLED			= (1 << 10),
 	/** curve can only have whole-number values (integer types) */
-	FCURVE_INT_VALUES		= (1<<11),
+	FCURVE_INT_VALUES		= (1 << 11),
 	/** curve can only have certain discrete-number values
 	 * (no interpolation at all, for enums/booleans) */
-	FCURVE_DISCRETE_VALUES	= (1<<12),
+	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') */
@@ -753,40 +753,40 @@ typedef enum eNlaStrip_Extrapolate_Mode {
 typedef enum eNlaStrip_Flag {
 	/* UI selection flags */
 	/** NLA strip is the active one in the track (also indicates if strip is being tweaked) */
-	NLASTRIP_FLAG_ACTIVE        = (1<<0),
+	NLASTRIP_FLAG_ACTIVE        = (1 << 0),
 	/* NLA strip is selected for editing */
-	NLASTRIP_FLAG_SELECT        = (1<<1),
-	//  NLASTRIP_FLAG_SELECT_L      = (1<<2),   // left handle selected
-	//  NLASTRIP_FLAG_SELECT_R      = (1<<3),   // right handle selected
+	NLASTRIP_FLAG_SELECT        = (1 << 1),
+	//  NLASTRIP_FLAG_SELECT_L      = (1 << 2),   // left handle selected
+	//  NLASTRIP_FLAG_SELECT_R      = (1 << 3),   // right handle selected
 
 	/** NLA strip uses the same action that the action being tweaked uses
 	 * (not set for the tweaking one though). */
-	NLASTRIP_FLAG_TWEAKUSER     = (1<<4),
+	NLASTRIP_FLAG_TWEAKUSER     = (1 << 4),
 
 	/* controls driven by local F-Curves */
 	/** strip influence is controlled by local F-Curve */
-	NLASTRIP_FLAG_USR_INFLUENCE = (1<<5),
-	NLASTRIP_FLAG_USR_TIME      = (1<<6),
-	NLASTRIP_FLAG_USR_TIME_CYCLIC = (1<<7),
+	NLASTRIP_FLAG_USR_INFLUENCE = (1 << 5),
+	NLASTRIP_FLAG_USR_TIME      = (1 << 6),
+	NLASTRIP_FLAG_USR_TIME_CYCLIC = (1 << 7),
 
 	/** NLA strip length is synced to the length of the referenced action */
-	NLASTRIP_FLAG_SYNC_LENGTH   = (1<<9),
+	NLASTRIP_FLAG_SYNC_LENGTH   = (1 << 9),
 
 	/* playback flags (may be overridden by F-Curves) */
 	/** NLA strip blendin/out values are set automatically based on overlaps */
-	NLASTRIP_FLAG_AUTO_BLENDS   = (1<<10),
+	NLASTRIP_FLAG_AUTO_BLENDS   = (1 << 10),
 	/** NLA strip is played back in reverse order */
-	NLASTRIP_FLAG_REVERSE       = (1<<11),
+	NLASTRIP_FLAG_REVERSE       = (1 << 11),
 	/** NLA strip is muted (i.e. doesn't contribute in any way) */
-	NLASTRIP_FLAG_MUTED         = (1<<12),
+	NLASTRIP_FLAG_MUTED         = (1 << 12),
 	/** NLA Strip is played back in 'ping-pong' style */
-	NLASTRIP_FLAG_MIRROR        = (1<<13),
+	NLASTRIP_FLAG_MIRROR        = (1 << 13),
 
 	/* temporary editing flags */
 	/** NLA strip should ignore frame range and hold settings, and evaluate at global time. */
-	NLASTRIP_FLAG_NO_TIME_MAP   = (1<<29),
+	NLASTRIP_FLAG_NO_TIME_MAP   = (1 << 29),
 	/** NLA-Strip is really just a temporary meta used to facilitate easier transform code */
-	NLASTRIP_FLAG_TEMP_META     = (1<<30),
+	NLASTRIP_FLAG_TEMP_META     = (1 << 30),
 	NLASTRIP_FLAG_EDIT_TOUCHED  = (1u << 31),
 } eNlaStrip_Flag;
 
@@ -833,19 +833,19 @@ typedef struct NlaTrack {
 typedef enum eNlaTrack_Flag {
 	/** track is the one that settings can be modified on,
 	 * also indicates if track is being 'tweaked' */
-	NLATRACK_ACTIVE		= (1<<0),
+	NLATRACK_ACTIVE		= (1 << 0),
 	/** track is selected in UI for relevant editing operations */
-	NLATRACK_SELECTED	= (1<<1),
+	NLATRACK_SELECTED	= (1 << 1),
 	/** track is not evaluated */
-	NLATRACK_MUTED		= (1<<2),
+	NLATRACK_MUTED		= (1 << 2),
 	/** track is the only one evaluated (must be used in conjunction with adt->flag) */
-	NLATRACK_SOLO		= (1<<3),
+	NLATRACK_SOLO		= (1 << 3),
 	/** track's settings (and strips) cannot be edited (to guard against unwanted changes) */
-	NLATRACK_PROTECTED	= (1<<4),
+	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;
 
 
@@ -891,7 +891,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 */
@@ -952,36 +952,36 @@ typedef struct KeyingSet {
 /* KeyingSet settings */
 typedef enum eKS_Settings {
 	/** Keyingset cannot be removed (and doesn't need to be freed). */
-	KEYINGSET_BUILTIN		= (1<<0),
+	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 */
 typedef enum eInsertKeyFlags {
 	INSERTKEY_NOFLAGS       = 0,
 	/** only insert keyframes where they're needed */
-	INSERTKEY_NEEDED 	= (1<<0),
+	INSERTKEY_NEEDED 	= (1 << 0),
 	/** insert 'visual' keyframes where possible/needed */
-	INSERTKEY_MATRIX 	= (1<<1),
+	INSERTKEY_MATRIX 	= (1 << 1),
 	/** don't recalculate handles,etc. after adding key */
-	INSERTKEY_FAST 		= (1<<2),
+	INSERTKEY_FAST 		= (1 << 2),
 	/** don't realloc mem (or increase count, as array has already been set out) */
-	INSERTKEY_FASTR		= (1<<3),
+	INSERTKEY_FASTR		= (1 << 3),
 	/** only replace an existing keyframe (this overrides INSERTKEY_NEEDED) */
-	INSERTKEY_REPLACE 	= (1<<4),
+	INSERTKEY_REPLACE 	= (1 << 4),
 	/** transform F-Curves should have XYZ->RGB color mode */
-	INSERTKEY_XYZ2RGB	= (1<<5),
+	INSERTKEY_XYZ2RGB	= (1 << 5),
 	/** ignore user-prefs (needed for predictable API use) */
-	INSERTKEY_NO_USERPREF	= (1<<6),
+	INSERTKEY_NO_USERPREF	= (1 << 6),
 	/** Allow to make a full copy of new key into existing one, if any,
 	 * instead of 'reusing' existing handles.
 	 * Used by copy/paste code. */
-	INSERTKEY_OVERWRITE_FULL = (1<<7),
+	INSERTKEY_OVERWRITE_FULL = (1 << 7),
 	/** for driver FCurves, use driver's "input" value - for easier corrective driver setup */
-	INSERTKEY_DRIVER         = (1<<8),
+	INSERTKEY_DRIVER         = (1 << 8),
 	/** for cyclic FCurves, adjust key timing to preserve the cycle period and flow */
-	INSERTKEY_CYCLE_AWARE    = (1<<9),
+	INSERTKEY_CYCLE_AWARE    = (1 << 9),
 } eInsertKeyFlags;
 
 /* ************************************************ */
@@ -1077,31 +1077,31 @@ typedef struct AnimData {
 /* Animation Data settings (mostly for NLA) */
 typedef enum eAnimData_Flag {
 	/** Only evaluate a single track in the NLA. */
-	ADT_NLA_SOLO_TRACK      = (1<<0),
+	ADT_NLA_SOLO_TRACK      = (1 << 0),
 	/** Don't use NLA */
-	ADT_NLA_EVAL_OFF        = (1<<1),
+	ADT_NLA_EVAL_OFF        = (1 << 1),
 	/** NLA is being 'tweaked' (i.e. in EditMode). */
-	ADT_NLA_EDIT_ON         = (1<<2),
+	ADT_NLA_EDIT_ON         = (1 << 2),
 	/** Active Action for 'tweaking' does not have mapping applied for editing. */
-	ADT_NLA_EDIT_NOMAP      = (1<<3),
+	ADT_NLA_EDIT_NOMAP      = (1 << 3),
 	/** NLA-Strip F-Curves are expanded in UI. */
-	ADT_NLA_SKEYS_COLLAPSED = (1<<4),
+	ADT_NLA_SKEYS_COLLAPSED = (1 << 4),
 
 	/** Drivers expanded in UI. */
-	ADT_DRIVERS_COLLAPSED   = (1<<10),
+	ADT_DRIVERS_COLLAPSED   = (1 << 10),
 	/** Don't execute drivers. */
-	ADT_DRIVERS_DISABLED    = (1<<11),
+	ADT_DRIVERS_DISABLED    = (1 << 11),
 
 	/** AnimData block is selected in UI. */
-	ADT_UI_SELECTED         = (1<<14),
+	ADT_UI_SELECTED         = (1 << 14),
 	/** AnimData block is active in UI. */
-	ADT_UI_ACTIVE           = (1<<15),
+	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),
 
 	/** F-Curves from this AnimData block are always visible. */
-	ADT_CURVES_ALWAYS_VISIBLE = (1<<17),
+	ADT_CURVES_ALWAYS_VISIBLE = (1 << 17),
 } eAnimData_Flag;
 
 /* Base Struct for Anim ------------------------------------- */
diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h
index af2aa0da5ab..3e725d131f2 100644
--- a/source/blender/makesdna/DNA_armature_types.h
+++ b/source/blender/makesdna/DNA_armature_types.h
@@ -135,27 +135,27 @@ typedef struct bArmature {
 /* armature->flag */
 /* don't use bit 7, was saved in files to disable stuff */
 typedef enum eArmature_Flag {
-	ARM_RESTPOS         = (1<<0),
+	ARM_RESTPOS         = (1 << 0),
 	/** XRAY is here only for backwards converting */
 	ARM_FLAG_UNUSED_1   = (1 << 1),  /* cleared */
-	ARM_DRAWAXES        = (1<<2),
-	ARM_DRAWNAMES       = (1<<3),
-	ARM_POSEMODE        = (1<<4),
-	ARM_FLAG_UNUSED_5   = (1<<5),  /* cleared */
-	ARM_DELAYDEFORM     = (1<<6),
+	ARM_DRAWAXES        = (1 << 2),
+	ARM_DRAWNAMES       = (1 << 3),
+	ARM_POSEMODE        = (1 << 4),
+	ARM_FLAG_UNUSED_5   = (1 << 5),  /* cleared */
+	ARM_DELAYDEFORM     = (1 << 6),
 	ARM_FLAG_UNUSED_7   = (1 << 7),  /* cleared */
-	ARM_MIRROR_EDIT     = (1<<8),
-	ARM_AUTO_IK         = (1<<9),
+	ARM_MIRROR_EDIT     = (1 << 8),
+	ARM_AUTO_IK         = (1 << 9),
 	/** made option negative, for backwards compat */
-	ARM_NO_CUSTOM       = (1<<10),
+	ARM_NO_CUSTOM       = (1 << 10),
 	/** draw custom colors  */
-	ARM_COL_CUSTOM      = (1<<11),
+	ARM_COL_CUSTOM      = (1 << 11),
 	/** when ghosting, only show selected bones (this should belong to ghostflag instead) */
 	ARM_FLAG_UNUSED_12  = (1 << 12), /* cleared */
 	/** dopesheet channel is expanded */
-	ARM_DS_EXPAND       = (1<<13),
+	ARM_DS_EXPAND       = (1 << 13),
 	/** other objects are used for visualizing various states (hack for efficient updates) */
-	ARM_HAS_VIZ_DEPS    = (1<<14),
+	ARM_HAS_VIZ_DEPS    = (1 << 14),
 } eArmature_Flag;
 
 /* armature->drawtype */
@@ -175,24 +175,24 @@ typedef enum eArmature_VertDeformer {
 
 /* armature->deformflag */
 typedef enum eArmature_DeformFlag {
-	ARM_DEF_VGROUP			= (1<<0),
-	ARM_DEF_ENVELOPE		= (1<<1),
-	ARM_DEF_QUATERNION		= (1<<2),
+	ARM_DEF_VGROUP			= (1 << 0),
+	ARM_DEF_ENVELOPE		= (1 << 1),
+	ARM_DEF_QUATERNION		= (1 << 2),
 #ifdef DNA_DEPRECATED
-	ARM_DEF_B_BONE_REST		= (1<<3),	/* deprecated */
+	ARM_DEF_B_BONE_REST		= (1 << 3),	/* deprecated */
 #endif
-	ARM_DEF_INVERT_VGROUP	= (1<<4),
+	ARM_DEF_INVERT_VGROUP	= (1 << 4),
 } eArmature_DeformFlag;
 
 /* armature->pathflag */
 // XXX deprecated... old animation system (armature only viz)
 #ifdef DNA_DEPRECATED
 typedef enum eArmature_PathFlag {
-	ARM_PATH_FNUMS		= (1<<0),
-	ARM_PATH_KFRAS		= (1<<1),
-	ARM_PATH_HEADS		= (1<<2),
-	ARM_PATH_ACFRA		= (1<<3),
-	ARM_PATH_KFNOS		= (1<<4),
+	ARM_PATH_FNUMS		= (1 << 0),
+	ARM_PATH_KFRAS		= (1 << 1),
+	ARM_PATH_HEADS		= (1 << 2),
+	ARM_PATH_ACFRA		= (1 << 3),
+	ARM_PATH_KFNOS		= (1 << 4),
 } eArmature_PathFlag;
 #endif
 
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index 096a2847074..51ff301abf2 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -114,7 +114,7 @@ typedef struct bConstraintTarget {
 /* bConstraintTarget -> flag */
 typedef enum eConstraintTargetFlag {
 	/** temporary target-struct that needs to be freed after use */
-	CONSTRAINT_TAR_TEMP = (1<<0),
+	CONSTRAINT_TAR_TEMP = (1 << 0),
 } eConstraintTargetFlag;
 
 /* bConstraintTarget/bConstraintOb -> type */
@@ -666,26 +666,26 @@ typedef enum eBConstraint_Types {
 } eBConstraint_Types;
 
 /* bConstraint->flag */
-/* flags 0x2 (1<<1) and 0x8 (1<<3) were used in past */
-/* flag 0x20 (1<<5) was used to indicate that a constraint was evaluated
+/* flags 0x2 (1 << 1) and 0x8 (1 << 3) were used in past */
+/* flag 0x20 (1 << 5) was used to indicate that a constraint was evaluated
  *                  using a 'local' hack for posebones only. */
 typedef enum eBConstraint_Flags {
 	/* expand for UI */
-	CONSTRAINT_EXPAND =		(1<<0),
+	CONSTRAINT_EXPAND =		(1 << 0),
 	/* pre-check for illegal object name or bone name */
-	CONSTRAINT_DISABLE = 	(1<<2),
+	CONSTRAINT_DISABLE = 	(1 << 2),
 	/* to indicate which Ipo should be shown, maybe for 3d access later too */
-	CONSTRAINT_ACTIVE = 	(1<<4),
+	CONSTRAINT_ACTIVE = 	(1 << 4),
 	/* to indicate that the owner's space should only be changed into ownspace, but not out of it */
-	CONSTRAINT_SPACEONCE = 	(1<<6),
+	CONSTRAINT_SPACEONCE = 	(1 << 6),
 	/* influence ipo is on constraint itself, not in action channel */
-	CONSTRAINT_OWN_IPO	= (1<<7),
+	CONSTRAINT_OWN_IPO	= (1 << 7),
 	/* indicates that constraint was added locally (i.e.  didn't come from the proxy-lib) */
-	CONSTRAINT_PROXY_LOCAL = (1<<8),
+	CONSTRAINT_PROXY_LOCAL = (1 << 8),
 	/* indicates that constraint is temporarily disabled (only used in GE) */
-	CONSTRAINT_OFF = (1<<9),
+	CONSTRAINT_OFF = (1 << 9),
 	/* use bbone curve shape when calculating headtail values (also used by dependency graph!) */
-	CONSTRAINT_BBONE_SHAPE = (1<<10),
+	CONSTRAINT_BBONE_SHAPE = (1 << 10),
 	/* That constraint has been inserted in local override (i.e. it can be fully edited!). */
 	CONSTRAINT_STATICOVERRIDE_LOCAL = (1 << 11),
 	/* use full transformation (not just segment locations) - only set at runtime  */
@@ -710,43 +710,43 @@ typedef enum eBConstraint_SpaceTypes {
 /* bConstraintChannel.flag */
 // XXX deprecated... old AnimSys
 typedef enum eConstraintChannel_Flags {
-	CONSTRAINT_CHANNEL_SELECT =		(1<<0),
-	CONSTRAINT_CHANNEL_PROTECTED =	(1<<1),
+	CONSTRAINT_CHANNEL_SELECT =		(1 << 0),
+	CONSTRAINT_CHANNEL_PROTECTED =	(1 << 1),
 } eConstraintChannel_Flags;
 
 /* -------------------------------------- */
 
 /* bRotateLikeConstraint.flag */
 typedef enum eCopyRotation_Flags {
-	ROTLIKE_X			= (1<<0),
-	ROTLIKE_Y			= (1<<1),
-	ROTLIKE_Z			= (1<<2),
-	ROTLIKE_X_INVERT	= (1<<4),
-	ROTLIKE_Y_INVERT	= (1<<5),
-	ROTLIKE_Z_INVERT 	= (1<<6),
-	ROTLIKE_OFFSET		= (1<<7),
+	ROTLIKE_X			= (1 << 0),
+	ROTLIKE_Y			= (1 << 1),
+	ROTLIKE_Z			= (1 << 2),
+	ROTLIKE_X_INVERT	= (1 << 4),
+	ROTLIKE_Y_INVERT	= (1 << 5),
+	ROTLIKE_Z_INVERT 	= (1 << 6),
+	ROTLIKE_OFFSET		= (1 << 7),
 } eCopyRotation_Flags;
 
 /* bLocateLikeConstraint.flag */
 typedef enum eCopyLocation_Flags {
-	LOCLIKE_X			= (1<<0),
-	LOCLIKE_Y			= (1<<1),
-	LOCLIKE_Z			= (1<<2),
+	LOCLIKE_X			= (1 << 0),
+	LOCLIKE_Y			= (1 << 1),
+	LOCLIKE_Z			= (1 << 2),
 	/** LOCLIKE_TIP is a deprecated option... use headtail=1.0f instead */
-	LOCLIKE_TIP			= (1<<3),
-	LOCLIKE_X_INVERT	= (1<<4),
-	LOCLIKE_Y_INVERT	= (1<<5),
-	LOCLIKE_Z_INVERT	= (1<<6),
-	LOCLIKE_OFFSET		= (1<<7),
+	LOCLIKE_TIP			= (1 << 3),
+	LOCLIKE_X_INVERT	= (1 << 4),
+	LOCLIKE_Y_INVERT	= (1 << 5),
+	LOCLIKE_Z_INVERT	= (1 << 6),
+	LOCLIKE_OFFSET		= (1 << 7),
 } eCopyLocation_Flags;
 
 /* bSizeLikeConstraint.flag */
 typedef enum eCopyScale_Flags {
-	SIZELIKE_X		= (1<<0),
-	SIZELIKE_Y		= (1<<1),
-	SIZELIKE_Z		= (1<<2),
-	SIZELIKE_OFFSET = (1<<3),
-	SIZELIKE_MULTIPLY = (1<<4),
+	SIZELIKE_X		= (1 << 0),
+	SIZELIKE_Y		= (1 << 1),
+	SIZELIKE_Z		= (1 << 2),
+	SIZELIKE_OFFSET = (1 << 3),
+	SIZELIKE_MULTIPLY = (1 << 4),
 } eCopyScale_Flags;
 
 /* bTransformConstraint.to/from */
@@ -812,14 +812,14 @@ typedef enum eShrinkwrap_Flags {
 
 /* FollowPath flags */
 typedef enum eFollowPath_Flags {
-	FOLLOWPATH_FOLLOW	= (1<<0),
-	FOLLOWPATH_STATIC	= (1<<1),
-	FOLLOWPATH_RADIUS	= (1<<2),
+	FOLLOWPATH_FOLLOW	= (1 << 0),
+	FOLLOWPATH_STATIC	= (1 << 1),
+	FOLLOWPATH_RADIUS	= (1 << 2),
 } eFollowPath_Flags;
 
 /* bTrackToConstraint->flags */
 typedef enum eTrackTo_Flags {
-	TARGET_Z_UP 	= (1<<0),
+	TARGET_Z_UP 	= (1 << 0),
 } eTrackTo_Flags;
 
 /* Stretch To Constraint -> volmode */
@@ -847,30 +847,30 @@ typedef enum eClampTo_Modes {
 
 /* ClampTo Constraint ->flag2 */
 typedef enum eClampTo_Flags {
-	CLAMPTO_CYCLIC	= (1<<0),
+	CLAMPTO_CYCLIC	= (1 << 0),
 } eClampTo_Flags;
 
 /* bKinematicConstraint->flag */
 typedef enum eKinematic_Flags {
-	CONSTRAINT_IK_TIP			= (1<<0),
-	CONSTRAINT_IK_ROT			= (1<<1),
+	CONSTRAINT_IK_TIP			= (1 << 0),
+	CONSTRAINT_IK_ROT			= (1 << 1),
 	/* targetless */
-	CONSTRAINT_IK_AUTO			= (1<<2),
+	CONSTRAINT_IK_AUTO			= (1 << 2),
 	/* autoik */
-	CONSTRAINT_IK_TEMP			= (1<<3),
-	CONSTRAINT_IK_STRETCH		= (1<<4),
-	CONSTRAINT_IK_POS			= (1<<5),
-	CONSTRAINT_IK_SETANGLE		= (1<<6),
-	CONSTRAINT_IK_GETANGLE		= (1<<7),
+	CONSTRAINT_IK_TEMP			= (1 << 3),
+	CONSTRAINT_IK_STRETCH		= (1 << 4),
+	CONSTRAINT_IK_POS			= (1 << 5),
+	CONSTRAINT_IK_SETANGLE		= (1 << 6),
+	CONSTRAINT_IK_GETANGLE		= (1 << 7),
 	/* limit axis */
-	CONSTRAINT_IK_NO_POS_X		= (1<<8),
-	CONSTRAINT_IK_NO_POS_Y		= (1<<9),
-	CONSTRAINT_IK_NO_POS_Z		= (1<<10),
-	CONSTRAINT_IK_NO_ROT_X		= (1<<11),
-	CONSTRAINT_IK_NO_ROT_Y		= (1<<12),
-	CONSTRAINT_IK_NO_ROT_Z		= (1<<13),
+	CONSTRAINT_IK_NO_POS_X		= (1 << 8),
+	CONSTRAINT_IK_NO_POS_Y		= (1 << 9),
+	CONSTRAINT_IK_NO_POS_Z		= (1 << 10),
+	CONSTRAINT_IK_NO_ROT_X		= (1 << 11),
+	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 */
@@ -906,52 +906,52 @@ typedef enum eSplineIK_XZScaleModes {
 /* bArmatureConstraint -> flag */
 typedef enum eArmature_Flags {
 	/** use dual quaternion blending */
-	CONSTRAINT_ARMATURE_QUATERNION      = (1<<0),
+	CONSTRAINT_ARMATURE_QUATERNION      = (1 << 0),
 	/** use envelopes */
-	CONSTRAINT_ARMATURE_ENVELOPE        = (1<<1),
+	CONSTRAINT_ARMATURE_ENVELOPE        = (1 << 1),
 	/** use current bone location */
-	CONSTRAINT_ARMATURE_CUR_LOCATION    = (1<<2),
+	CONSTRAINT_ARMATURE_CUR_LOCATION    = (1 << 2),
 } eArmature_Flags;
 
 /* MinMax (floor) flags */
 typedef enum eFloor_Flags {
-	MINMAX_STICKY	= (1<<0),
-	MINMAX_STUCK	= (1<<1),
-	MINMAX_USEROT	= (1<<2),
+	MINMAX_STICKY	= (1 << 0),
+	MINMAX_STUCK	= (1 << 1),
+	MINMAX_USEROT	= (1 << 2),
 } eFloor_Flags;
 
 /* transform limiting constraints -> flag2 */
 typedef enum eTransformLimits_Flags2 {
 	/* not used anymore - for older Limit Location constraints only */
-	LIMIT_NOPARENT 	= (1<<0),
+	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)  */
 typedef enum eTransformLimits_Flags {
-	LIMIT_XMIN = (1<<0),
-	LIMIT_XMAX = (1<<1),
-	LIMIT_YMIN = (1<<2),
-	LIMIT_YMAX = (1<<3),
-	LIMIT_ZMIN = (1<<4),
-	LIMIT_ZMAX = (1<<5),
+	LIMIT_XMIN = (1 << 0),
+	LIMIT_XMAX = (1 << 1),
+	LIMIT_YMIN = (1 << 2),
+	LIMIT_YMAX = (1 << 3),
+	LIMIT_ZMIN = (1 << 4),
+	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_XROT = (1 << 0),
+	LIMIT_YROT = (1 << 1),
+	LIMIT_ZROT = (1 << 2),
 } eRotLimit_Flags;
 
 /* distance limit constraint */
 	/* bDistLimitConstraint->flag */
 typedef enum eDistLimit_Flag {
 	/* "soft" cushion effect when reaching the limit sphere */ // NOT IMPLEMENTED!
-	LIMITDIST_USESOFT	= (1<<0),
+	LIMITDIST_USESOFT	= (1 << 0),
 	/* as for all Limit constraints - allow to be used during transform? */
-	LIMITDIST_TRANSFORM = (1<<1),
+	LIMITDIST_TRANSFORM = (1 << 1),
 } eDistLimit_Flag;
 
 	/* bDistLimitConstraint->mode */
@@ -963,21 +963,21 @@ typedef enum eDistLimit_Modes {
 
 /* python constraint -> flag */
 typedef enum ePyConstraint_Flags {
-	PYCON_USETARGETS	= (1<<0),
-	PYCON_SCRIPTERROR	= (1<<1),
+	PYCON_USETARGETS	= (1 << 0),
+	PYCON_SCRIPTERROR	= (1 << 1),
 } ePyConstraint_Flags;
 
 /* ChildOf Constraint -> flag */
 typedef enum eChildOf_Flags {
-	CHILDOF_LOCX 	= (1<<0),
-	CHILDOF_LOCY	= (1<<1),
-	CHILDOF_LOCZ	= (1<<2),
-	CHILDOF_ROTX	= (1<<3),
-	CHILDOF_ROTY	= (1<<4),
-	CHILDOF_ROTZ	= (1<<5),
-	CHILDOF_SIZEX	= (1<<6),
-	CHILDOF_SIZEY	= (1<<7),
-	CHILDOF_SIZEZ	= (1<<8),
+	CHILDOF_LOCX 	= (1 << 0),
+	CHILDOF_LOCY	= (1 << 1),
+	CHILDOF_LOCZ	= (1 << 2),
+	CHILDOF_ROTX	= (1 << 3),
+	CHILDOF_ROTY	= (1 << 4),
+	CHILDOF_ROTZ	= (1 << 5),
+	CHILDOF_SIZEX	= (1 << 6),
+	CHILDOF_SIZEY	= (1 << 7),
+	CHILDOF_SIZEZ	= (1 << 8),
 	CHILDOF_ALL		= 511,
 } eChildOf_Flags;
 
@@ -1005,15 +1005,15 @@ typedef enum ePivotConstraint_Axis {
 	/* settings for Pivot Constraint in general */
 typedef enum ePivotConstraint_Flag {
 	/* offset is to be interpreted as being a fixed-point in space */
-	PIVOTCON_FLAG_OFFSET_ABS	= (1<<0),
+	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;
 
 typedef enum eFollowTrack_Flags {
-	FOLLOWTRACK_ACTIVECLIP	= (1<<0),
-	FOLLOWTRACK_USE_3D_POSITION	= (1<<1),
-	FOLLOWTRACK_USE_UNDISTORTION	= (1<<2),
+	FOLLOWTRACK_ACTIVECLIP	= (1 << 0),
+	FOLLOWTRACK_USE_3D_POSITION	= (1 << 1),
+	FOLLOWTRACK_USE_UNDISTORTION	= (1 << 2),
 } eFollowTrack_Flags;
 
 typedef enum eFollowTrack_FrameMethod {
@@ -1024,12 +1024,12 @@ typedef enum eFollowTrack_FrameMethod {
 
 /* CameraSolver Constraint -> flag */
 typedef enum eCameraSolver_Flags {
-	CAMERASOLVER_ACTIVECLIP	= (1<<0),
+	CAMERASOLVER_ACTIVECLIP	= (1 << 0),
 } eCameraSolver_Flags;
 
 /* ObjectSolver Constraint -> flag */
 typedef enum eObjectSolver_Flags {
-	OBJECTSOLVER_ACTIVECLIP	= (1<<0),
+	OBJECTSOLVER_ACTIVECLIP	= (1 << 0),
 } eObjectSolver_Flags;
 
 /* ObjectSolver Constraint -> flag */
diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index b728e5081ba..9be5448a327 100644
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -200,24 +200,24 @@ typedef struct Ipo {
 #define MA_FRESTRAI	25
 #define MA_ADD		26
 
-#define MA_MAP1		(1<<5)
-#define MA_MAP2		(1<<6)
-#define MA_MAP3		(1<<7)
-#define MA_MAP4		(1<<8)
-#define MA_MAP5		(1<<9)
-#define MA_MAP6		(1<<10)
-#define MA_MAP7		(1<<11)
-#define MA_MAP8		(1<<12)
-#define MA_MAP9		(1<<13)
-#define MA_MAP10	(1<<14)
-#define MA_MAP11	(1<<15)
-#define MA_MAP12	(1<<16)
-#define MA_MAP13	(1<<17)
-#define MA_MAP14	(1<<18)
-#define MA_MAP15	(1<<19)
-#define MA_MAP16	(1<<20)
-#define MA_MAP17	(1<<21)
-#define MA_MAP18	(1<<22)
+#define MA_MAP1		(1 << 5)
+#define MA_MAP2		(1 << 6)
+#define MA_MAP3		(1 << 7)
+#define MA_MAP4		(1 << 8)
+#define MA_MAP5		(1 << 9)
+#define MA_MAP6		(1 << 10)
+#define MA_MAP7		(1 << 11)
+#define MA_MAP8		(1 << 12)
+#define MA_MAP9		(1 << 13)
+#define MA_MAP10	(1 << 14)
+#define MA_MAP11	(1 << 15)
+#define MA_MAP12	(1 << 16)
+#define MA_MAP13	(1 << 17)
+#define MA_MAP14	(1 << 18)
+#define MA_MAP15	(1 << 19)
+#define MA_MAP16	(1 << 20)
+#define MA_MAP17	(1 << 21)
+#define MA_MAP18	(1 << 22)
 
 /* ********** Texture Slots (MTex) ********** */
 
@@ -518,6 +518,6 @@ typedef struct Ipo {
 
 /* driver->flag */
 	/* invalid flag: currently only used for buggy pydriver expressions */
-#define IPO_DRIVER_FLAG_INVALID 	(1<<0)
+#define IPO_DRIVER_FLAG_INVALID 	(1 << 0)
 
 #endif
diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h
index f5bc9ef383a..92b6c6e3c5b 100644
--- a/source/blender/makesdna/DNA_meta_types.h
+++ b/source/blender/makesdna/DNA_meta_types.h
@@ -116,7 +116,7 @@ typedef struct MetaBall {
 #define MB_UPDATE_NEVER		3
 
 /* mb->flag2 */
-#define MB_DS_EXPAND 	(1<<0)
+#define MB_DS_EXPAND 	(1 << 0)
 
 
 /* ml->type */
diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h
index fb3b3f994b4..790b44466c5 100644
--- a/source/blender/makesdna/DNA_movieclip_types.h
+++ b/source/blender/makesdna/DNA_movieclip_types.h
@@ -172,7 +172,7 @@ enum {
 enum {
 	MCLIP_USE_PROXY               = (1 << 0),
 	MCLIP_USE_PROXY_CUSTOM_DIR    = (1 << 1),
-	/* MCLIP_CUSTOM_START_FRAME    = (1<<2), */ /* UNUSED */
+	/* MCLIP_CUSTOM_START_FRAME    = (1 << 2), */ /* UNUSED */
 	MCLIP_DATA_EXPAND             = (1 << 3),
 
 	MCLIP_TIMECODE_FLAGS          =  (MCLIP_USE_PROXY | MCLIP_USE_PROXY_CUSTOM_DIR),
diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h
index f1b1ab21116..4095a5dc99b 100644
--- a/source/blender/makesdna/DNA_nla_types.h
+++ b/source/blender/makesdna/DNA_nla_types.h
@@ -94,20 +94,20 @@ typedef struct bActionStrip {
 
 /* strip->flag */
 typedef enum eActStrip_Flag {
-	ACTSTRIP_SELECT			= (1<<0),
-	ACTSTRIP_USESTRIDE		= (1<<1),
+	ACTSTRIP_SELECT			= (1 << 0),
+	ACTSTRIP_USESTRIDE		= (1 << 1),
 	/* Not implemented. Is not used anywhere */
-	ACTSTRIP_BLENDTONEXT	= (1<<2),
-	ACTSTRIP_HOLDLASTFRAME	= (1<<3),
-	ACTSTRIP_ACTIVE			= (1<<4),
-	ACTSTRIP_LOCK_ACTION	= (1<<5),
-	ACTSTRIP_MUTE			= (1<<6),
+	ACTSTRIP_BLENDTONEXT	= (1 << 2),
+	ACTSTRIP_HOLDLASTFRAME	= (1 << 3),
+	ACTSTRIP_ACTIVE			= (1 << 4),
+	ACTSTRIP_LOCK_ACTION	= (1 << 5),
+	ACTSTRIP_MUTE			= (1 << 6),
 	/* This has yet to be implemented. To indicate that a strip should be played backwards */
-	ACTSTRIP_REVERSE		= (1<<7),
-	ACTSTRIP_CYCLIC_USEX	= (1<<8),
-	ACTSTRIP_CYCLIC_USEY	= (1<<9),
-	ACTSTRIP_CYCLIC_USEZ	= (1<<10),
-	ACTSTRIP_AUTO_BLENDS	= (1<<11),
+	ACTSTRIP_REVERSE		= (1 << 7),
+	ACTSTRIP_CYCLIC_USEX	= (1 << 8),
+	ACTSTRIP_CYCLIC_USEY	= (1 << 9),
+	ACTSTRIP_CYCLIC_USEZ	= (1 << 10),
+	ACTSTRIP_AUTO_BLENDS	= (1 << 11),
 } eActStrip_Flag;
 
 #endif
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index a255646b734..0f06aed8bca 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -307,31 +307,31 @@ typedef struct bNode {
 #define NODE_MUTED			512
 // #define NODE_CUSTOM_NAME	1024	/* deprecated! */
 	/* group node types: use const outputs by default */
-#define NODE_CONST_OUTPUT	(1<<11)
+#define NODE_CONST_OUTPUT	(1 << 11)
 	/* node is always behind others */
-#define NODE_BACKGROUND		(1<<12)
+#define NODE_BACKGROUND		(1 << 12)
 	/* automatic flag for nodes included in transforms */
-#define NODE_TRANSFORM		(1<<13)
+#define NODE_TRANSFORM		(1 << 13)
 	/* node is active texture */
 
 	/* note: take care with this flag since its possible it gets
 	 * `stuck` inside/outside the active group - which makes buttons
 	 * window texture not update, we try to avoid it by clearing the
 	 * flag when toggling group editing - Campbell */
-#define NODE_ACTIVE_TEXTURE	(1<<14)
+#define NODE_ACTIVE_TEXTURE	(1 << 14)
 	/* use a custom color for the node */
-#define NODE_CUSTOM_COLOR	(1<<15)
+#define NODE_CUSTOM_COLOR	(1 << 15)
 	/* Node has been initialized
 	 * This flag indicates the node->typeinfo->init function has been called.
 	 * In case of undefined type at creation time this can be delayed until
 	 * until the node type is registered.
 	 */
-#define NODE_INIT			(1<<16)
+#define NODE_INIT			(1 << 16)
 
 	/* do recalc of output, used to skip recalculation of unwanted
 	 * composite out nodes when editing tree
 	 */
-#define NODE_DO_OUTPUT_RECALC	(1<<17)
+#define NODE_DO_OUTPUT_RECALC	(1 << 17)
 
 /* node->update */
 /* XXX NODE_UPDATE is a generic update flag. More fine-grained updates
diff --git a/source/blender/makesdna/DNA_object_fluidsim_types.h b/source/blender/makesdna/DNA_object_fluidsim_types.h
index 534eaf3c780..843a9ae5c5b 100644
--- a/source/blender/makesdna/DNA_object_fluidsim_types.h
+++ b/source/blender/makesdna/DNA_object_fluidsim_types.h
@@ -152,25 +152,25 @@ typedef struct FluidsimSettings {
 #define OB_FLUIDSIM_CONTROL			128
 
 #define OB_TYPEFLAG_START       7
-#define OB_FSGEO_THIN           (1<<(OB_TYPEFLAG_START+1))
-#define OB_FSBND_NOSLIP         (1<<(OB_TYPEFLAG_START+2))
-#define OB_FSBND_PARTSLIP       (1<<(OB_TYPEFLAG_START+3))
-#define OB_FSBND_FREESLIP       (1<<(OB_TYPEFLAG_START+4))
-#define OB_FSINFLOW_LOCALCOORD  (1<<(OB_TYPEFLAG_START+5))
+#define OB_FSGEO_THIN           (1 << (OB_TYPEFLAG_START + 1))
+#define OB_FSBND_NOSLIP         (1 << (OB_TYPEFLAG_START + 2))
+#define OB_FSBND_PARTSLIP       (1 << (OB_TYPEFLAG_START + 3))
+#define OB_FSBND_FREESLIP       (1 << (OB_TYPEFLAG_START + 4))
+#define OB_FSINFLOW_LOCALCOORD  (1 << (OB_TYPEFLAG_START + 5))
 
 /* surface generation flag (part of enabling chapter 6 of
  * "Free Surface Flows with Moving and Deforming Objects for LBM") */
-#define OB_FSSG_NOOBS			(1<<(OB_TYPEFLAG_START+6))
+#define OB_FSSG_NOOBS			(1 << (OB_TYPEFLAG_START + 6))
 
 // guiDisplayMode particle flags
 #define OB_FSDOM_GEOM     1
 #define OB_FSDOM_PREVIEW  2
 #define OB_FSDOM_FINAL    3
-#define OB_FSPART_BUBBLE  (1<<1)
-#define OB_FSPART_DROP    (1<<2)
-#define OB_FSPART_NEWPART (1<<3)
-#define OB_FSPART_FLOAT   (1<<4)
-#define OB_FSPART_TRACER  (1<<5)
+#define OB_FSPART_BUBBLE  (1 << 1)
+#define OB_FSPART_DROP    (1 << 2)
+#define OB_FSPART_NEWPART (1 << 3)
+#define OB_FSPART_FLOAT   (1 << 4)
+#define OB_FSPART_TRACER  (1 << 5)
 
 // new fluid bit flags for fss->flags
 #define OB_FLUIDSIM_REVERSE			(1 << 0)
diff --git a/source/blender/makesdna/DNA_object_force_types.h b/source/blender/makesdna/DNA_object_force_types.h
index c5391d7c6d2..4b276a0aa85 100644
--- a/source/blender/makesdna/DNA_object_force_types.h
+++ b/source/blender/makesdna/DNA_object_force_types.h
@@ -186,7 +186,7 @@ typedef struct EffectorWeights {
 #define EFF_WEIGHT_DO_HAIR		1
 
 /* Point cache file data types:
- * - used as (1<<flag) so poke jahka if you reach the limit of 15
+ * - used as (1 << flag) so poke jahka if you reach the limit of 15
  * - to add new data types update:
  *   - BKE_ptcache_data_size()
  *   - ptcache_file_init_pointers()
@@ -274,7 +274,7 @@ typedef struct PointCache {
 	char path[1024];
 
 	/**
-	 * Array of length endframe-startframe+1 with flags to indicate cached frames.
+	 * Array of length `endframe - startframe + 1` with flags to indicate cached frames.
 	 * Can be later used for other per frame flags too if needed.
 	 */
 	char *cached_frames;
@@ -450,7 +450,7 @@ typedef struct SoftBody {
 /** used for (simple) force */
 #define PFIELD_GRAVITATION      (1 << 18)
 /** Enable cloth collision side detection based on normal. */
-#define PFIELD_CLOTH_USE_CULLING (1<< 19)
+#define PFIELD_CLOTH_USE_CULLING (1 << 19)
 /** Replace collision direction with collider normal. */
 #define PFIELD_CLOTH_USE_NORMAL (1 << 20)
 
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 68bc79d4543..7a7c30950cc 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -452,32 +452,32 @@ typedef enum eParticleDrawFlag {
 #define PART_EDISTR			256	/* particle/face from face areas */
 
 #define PART_ROTATIONS		512	/* calculate particle rotations (and store them in pointcache) */
-#define PART_DIE_ON_COL		(1<<12)
-#define PART_SIZE_DEFL		(1<<13) /* swept sphere deflections */
-#define PART_ROT_DYN		(1<<14)	/* dynamic rotation */
-#define PART_SIZEMASS		(1<<16)
+#define PART_DIE_ON_COL		(1 << 12)
+#define PART_SIZE_DEFL		(1 << 13) /* swept sphere deflections */
+#define PART_ROT_DYN		(1 << 14)	/* dynamic rotation */
+#define PART_SIZEMASS		(1 << 16)
 
-#define PART_HIDE_ADVANCED_HAIR	(1<<15)
+#define PART_HIDE_ADVANCED_HAIR	(1 << 15)
 
-//#define PART_ABS_TIME		(1<<17)
-//#define PART_GLOB_TIME		(1<<18)
+//#define PART_ABS_TIME		(1 << 17)
+//#define PART_GLOB_TIME		(1 << 18)
 
-#define PART_BOIDS_2D		(1<<19)
+#define PART_BOIDS_2D		(1 << 19)
 
-//#define PART_BRANCHING		(1<<20)
-//#define PART_ANIM_BRANCHING	(1<<21)
+//#define PART_BRANCHING		(1 << 20)
+//#define PART_ANIM_BRANCHING	(1 << 21)
 
 #define PART_HAIR_BSPLINE	1024
 
-#define PART_GRID_HEXAGONAL	(1<<24)
-#define PART_GRID_INVERT	(1<<26)
+#define PART_GRID_HEXAGONAL	(1 << 24)
+#define PART_GRID_INVERT	(1 << 26)
 
-#define PART_CHILD_EFFECT		(1<<27)
-#define PART_CHILD_LONG_HAIR	(1<<28)
-/* #define PART_CHILD_RENDER		(1<<29) */ /*UNUSED*/
-#define PART_CHILD_GUIDE		(1<<30)
+#define PART_CHILD_EFFECT		(1 << 27)
+#define PART_CHILD_LONG_HAIR	(1 << 28)
+/* #define PART_CHILD_RENDER		(1 << 29) */ /*UNUSED*/
+#define PART_CHILD_GUIDE		(1 << 30)
 
-#define PART_SELF_EFFECT	(1<<22)
+#define PART_SELF_EFFECT	(1 << 22)
 
 /* part->from */
 #define PART_FROM_VERT		0
@@ -510,15 +510,15 @@ typedef enum eParticleKink {
 
 /* part->child_flag */
 typedef enum eParticleChildFlag {
-	PART_CHILD_USE_CLUMP_NOISE  = (1<<0),
-	PART_CHILD_USE_CLUMP_CURVE  = (1<<1),
-	PART_CHILD_USE_ROUGH_CURVE  = (1<<2),
-	PART_CHILD_USE_TWIST_CURVE  = (1<<3),
+	PART_CHILD_USE_CLUMP_NOISE  = (1 << 0),
+	PART_CHILD_USE_CLUMP_CURVE  = (1 << 1),
+	PART_CHILD_USE_ROUGH_CURVE  = (1 << 2),
+	PART_CHILD_USE_TWIST_CURVE  = (1 << 3),
 } eParticleChildFlag;
 
 /* part->shape_flag */
 typedef enum eParticleShapeFlag {
-	PART_SHAPE_CLOSE_TIP     = (1<<0),
+	PART_SHAPE_CLOSE_TIP     = (1 << 0),
 } eParticleShapeFlag;
 
 /* part->draw_col */
@@ -643,25 +643,25 @@ typedef enum eParticleShapeFlag {
 /* mapto */
 typedef enum eParticleTextureInfluence {
 	/* init */
-	PAMAP_TIME		= (1<<0),	/* emission time */
-	PAMAP_LIFE		= (1<<1),	/* life time */
-	PAMAP_DENS		= (1<<2),	/* density */
-	PAMAP_SIZE		= (1<<3),	/* physical size */
+	PAMAP_TIME		= (1 << 0),	/* emission time */
+	PAMAP_LIFE		= (1 << 1),	/* life time */
+	PAMAP_DENS		= (1 << 2),	/* density */
+	PAMAP_SIZE		= (1 << 3),	/* physical size */
 	PAMAP_INIT		= (PAMAP_TIME | PAMAP_LIFE | PAMAP_DENS | PAMAP_SIZE),
 	/* reset */
-	PAMAP_IVEL		= (1<<5),	/* initial velocity */
+	PAMAP_IVEL		= (1 << 5),	/* initial velocity */
 	/* physics */
-	PAMAP_FIELD		= (1<<6),	/* force fields */
-	PAMAP_GRAVITY	= (1<<10),
-	PAMAP_DAMP		= (1<<11),
+	PAMAP_FIELD		= (1 << 6),	/* force fields */
+	PAMAP_GRAVITY	= (1 << 10),
+	PAMAP_DAMP		= (1 << 11),
 	PAMAP_PHYSICS	= (PAMAP_FIELD | PAMAP_GRAVITY | PAMAP_DAMP),
 	/* children */
-	PAMAP_CLUMP		= (1<<7),
-	PAMAP_KINK_FREQ	= (1<<8),
-	PAMAP_KINK_AMP	= (1<<12),
-	PAMAP_ROUGH		= (1<<9),
-	PAMAP_LENGTH	= (1<<4),
-	PAMAP_TWIST	= (1<<13),
+	PAMAP_CLUMP		= (1 << 7),
+	PAMAP_KINK_FREQ	= (1 << 8),
+	PAMAP_KINK_AMP	= (1 << 12),
+	PAMAP_ROUGH		= (1 << 9),
+	PAMAP_LENGTH	= (1 << 4),
+	PAMAP_TWIST	= (1 << 13),
 	PAMAP_CHILD		= (PAMAP_CLUMP | PAMAP_KINK_FREQ | PAMAP_KINK_AMP | PAMAP_ROUGH | PAMAP_LENGTH | PAMAP_TWIST),
 } eParticleTextureInfluence;
 
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 428eb8fbc57..75dda608975 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -334,7 +334,7 @@ typedef struct SceneRenderView {
 } SceneRenderView;
 
 /* SceneRenderView.viewflag */
-#define SCE_VIEW_DISABLE		(1<<0)
+#define SCE_VIEW_DISABLE		(1 << 0)
 
 /* RenderData.views_format */
 enum {
@@ -483,17 +483,17 @@ typedef struct ImageFormatData {
 #define R_IMF_IMTYPE_INVALID        255
 
 /* ImageFormatData.flag */
-#define R_IMF_FLAG_ZBUF         (1<<0)   /* was R_OPENEXR_ZBUF */
-#define R_IMF_FLAG_PREVIEW_JPG  (1<<1)   /* was R_PREVIEW_JPG */
+#define R_IMF_FLAG_ZBUF         (1 << 0)   /* was R_OPENEXR_ZBUF */
+#define R_IMF_FLAG_PREVIEW_JPG  (1 << 1)   /* was R_PREVIEW_JPG */
 
 /* return values from BKE_imtype_valid_depths, note this is depts per channel */
-#define R_IMF_CHAN_DEPTH_1  (1<<0) /* 1bits  (unused) */
-#define R_IMF_CHAN_DEPTH_8  (1<<1) /* 8bits  (default) */
-#define R_IMF_CHAN_DEPTH_10 (1<<2) /* 10bits (uncommon, Cineon/DPX support) */
-#define R_IMF_CHAN_DEPTH_12 (1<<3) /* 12bits (uncommon, jp2/DPX support) */
-#define R_IMF_CHAN_DEPTH_16 (1<<4) /* 16bits (tiff, halff float exr) */
-#define R_IMF_CHAN_DEPTH_24 (1<<5) /* 24bits (unused) */
-#define R_IMF_CHAN_DEPTH_32 (1<<6) /* 32bits (full float exr) */
+#define R_IMF_CHAN_DEPTH_1  (1 << 0) /* 1bits  (unused) */
+#define R_IMF_CHAN_DEPTH_8  (1 << 1) /* 8bits  (default) */
+#define R_IMF_CHAN_DEPTH_10 (1 << 2) /* 10bits (uncommon, Cineon/DPX support) */
+#define R_IMF_CHAN_DEPTH_12 (1 << 3) /* 12bits (uncommon, jp2/DPX support) */
+#define R_IMF_CHAN_DEPTH_16 (1 << 4) /* 16bits (tiff, halff float exr) */
+#define R_IMF_CHAN_DEPTH_24 (1 << 5) /* 24bits (unused) */
+#define R_IMF_CHAN_DEPTH_32 (1 << 6) /* 32bits (full float exr) */
 
 /* ImageFormatData.planes */
 #define R_IMF_PLANES_RGB   24
@@ -514,16 +514,16 @@ typedef struct ImageFormatData {
 #define R_IMF_EXR_CODEC_MAX  10
 
 /* ImageFormatData.jp2_flag */
-#define R_IMF_JP2_FLAG_YCC          (1<<0)  /* when disabled use RGB */ /* was R_JPEG2K_YCC */
-#define R_IMF_JP2_FLAG_CINE_PRESET  (1<<1)  /* was R_JPEG2K_CINE_PRESET */
-#define R_IMF_JP2_FLAG_CINE_48      (1<<2)  /* was R_JPEG2K_CINE_48FPS */
+#define R_IMF_JP2_FLAG_YCC          (1 << 0)  /* when disabled use RGB */ /* was R_JPEG2K_YCC */
+#define R_IMF_JP2_FLAG_CINE_PRESET  (1 << 1)  /* was R_JPEG2K_CINE_PRESET */
+#define R_IMF_JP2_FLAG_CINE_48      (1 << 2)  /* was R_JPEG2K_CINE_48FPS */
 
 /* ImageFormatData.jp2_codec */
 #define R_IMF_JP2_CODEC_JP2  0
 #define R_IMF_JP2_CODEC_J2K  1
 
 /* ImageFormatData.cineon_flag */
-#define R_IMF_CINEON_FLAG_LOG (1<<0)  /* was R_CINEON_LOG */
+#define R_IMF_CINEON_FLAG_LOG (1 << 0)  /* was R_CINEON_LOG */
 
 /* ImageFormatData.tiff_codec */
 enum {
@@ -1785,10 +1785,10 @@ typedef struct Scene {
 
 /* RenderData.flag */
 	/* use preview range */
-#define SCER_PRV_RANGE	(1<<0)
-#define SCER_LOCK_FRAME_SELECTION	(1<<1)
+#define SCER_PRV_RANGE	(1 << 0)
+#define SCER_LOCK_FRAME_SELECTION	(1 << 1)
 	/* show/use subframes (for checking motion blur) */
-#define SCER_SHOW_SUBFRAME	(1<<3)
+#define SCER_SHOW_SUBFRAME	(1 << 3)
 
 /* RenderData.mode */
 #define R_OSA                   (1 << 0)
@@ -2128,11 +2128,11 @@ typedef enum eVGroupSelect {
 
 
 /* Scene.flag */
-#define SCE_DS_SELECTED			(1<<0)
-#define SCE_DS_COLLAPSED		(1<<1)
-#define SCE_NLA_EDIT_ON			(1<<2)
-#define SCE_FRAME_DROP			(1<<3)
-#define SCE_KEYS_NO_SELONLY	    (1<<4)
+#define SCE_DS_SELECTED			(1 << 0)
+#define SCE_DS_COLLAPSED		(1 << 1)
+#define SCE_NLA_EDIT_ON			(1 << 2)
+#define SCE_FRAME_DROP			(1 << 3)
+#define SCE_KEYS_NO_SELONLY	    (1 << 4)
 
 	/* return flag BKE_scene_base_iter_next functions */
 /* #define F_ERROR			-1 */  /* UNUSED */
@@ -2141,10 +2141,10 @@ typedef enum eVGroupSelect {
 #define F_DUPLI			3
 
 /* AudioData.flag */
-#define AUDIO_MUTE                (1<<0)
-#define AUDIO_SYNC                (1<<1)
-#define AUDIO_SCRUB		          (1<<2)
-#define AUDIO_VOLUME_ANIMATED     (1<<3)
+#define AUDIO_MUTE                (1 << 0)
+#define AUDIO_SYNC                (1 << 1)
+#define AUDIO_SCRUB		          (1 << 2)
+#define AUDIO_VOLUME_ANIMATED     (1 << 3)
 
 /* FFMpegCodecData.flags */
 enum {
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index 9f8d3449d39..e4f4db0be78 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -38,11 +38,11 @@ enum {
 };
 
 /* noise */
-#define MOD_SMOKE_NOISEWAVE (1<<0)
-#define MOD_SMOKE_NOISEFFT (1<<1)
-#define MOD_SMOKE_NOISECURL (1<<2)
+#define MOD_SMOKE_NOISEWAVE (1 << 0)
+#define MOD_SMOKE_NOISEFFT (1 << 1)
+#define MOD_SMOKE_NOISECURL (1 << 2)
 /* viewsettings */
-#define MOD_SMOKE_VIEW_SHOW_HIGHRES (1<<0)
+#define MOD_SMOKE_VIEW_SHOW_HIGHRES (1 << 0)
 
 /* slice method */
 enum {
@@ -112,10 +112,10 @@ enum {
 #define SM_HRES_FULLSAMPLE	2
 
 /* smoke data fields (active_fields) */
-#define SM_ACTIVE_HEAT		(1<<0)
-#define SM_ACTIVE_FIRE		(1<<1)
-#define SM_ACTIVE_COLORS	(1<<2)
-#define SM_ACTIVE_COLOR_SET	(1<<3)
+#define SM_ACTIVE_HEAT		(1 << 0)
+#define SM_ACTIVE_FIRE		(1 << 1)
+#define SM_ACTIVE_COLORS	(1 << 2)
+#define SM_ACTIVE_COLOR_SET	(1 << 3)
 
 enum {
 	VDB_COMPRESSION_BLOSC = 0,
diff --git a/source/blender/makesdna/DNA_speaker_types.h b/source/blender/makesdna/DNA_speaker_types.h
index 6d40f8bff72..786c549d074 100644
--- a/source/blender/makesdna/DNA_speaker_types.h
+++ b/source/blender/makesdna/DNA_speaker_types.h
@@ -55,8 +55,8 @@ typedef struct Speaker {
 /* **************** SPEAKER ********************* */
 
 /* flag */
-#define SPK_DS_EXPAND   (1<<0)
-#define SPK_MUTED       (1<<1)
-// #define SPK_RELATIVE    (1<<2)  /* UNUSED */
+#define SPK_DS_EXPAND   (1 << 0)
+#define SPK_MUTED       (1 << 1)
+// #define SPK_RELATIVE    (1 << 2)  /* UNUSED */
 
 #endif /* __DNA_SPEAKER_TYPES_H__ */
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 3db9f2d7131..96745b40382 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -128,7 +128,7 @@ typedef struct PointDensity {
 
 	/** for 'Object' or 'Particle system' type - source object */
 	struct Object *object;
-	/** index+1 in ob.particlesystem, non-ID pointer not allowed */
+	/** `index + 1` in ob.particlesystem, non-ID pointer not allowed */
 	int psys;
 	/** cache points in worldspace, object space, ... ? */
 	short psys_cache_space;
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index 753c9378797..63a36f9acf6 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -182,8 +182,8 @@ typedef struct wmWindowManager {
 
 /* wmWindowManager.initialized */
 enum {
-	WM_WINDOW_IS_INITIALIZED = (1<<0),
-	WM_KEYCONFIG_IS_INITIALIZED = (1<<1),
+	WM_WINDOW_IS_INITIALIZED = (1 << 0),
+	WM_KEYCONFIG_IS_INITIALIZED = (1 << 1),
 };
 
 #define WM_KEYCONFIG_STR_DEFAULT "blender"
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index 9ca56ebf78a..ca7b22d5ec3 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -113,10 +113,10 @@ enum {
 };
 
 /* flag */
-#define WO_DS_EXPAND	(1<<0)
+#define WO_DS_EXPAND	(1 << 0)
 	/* NOTE: this must have the same value as MA_DS_SHOW_TEXS,
 	 * otherwise anim-editors will not read correctly
 	 */
-#define WO_DS_SHOW_TEXS	(1<<2)
+#define WO_DS_SHOW_TEXS	(1 << 2)
 
 #endif