Cleanup: use 'e' prefix for enum typedefs

Convention was only followed loosely,
apply to DNA where changes aren't likely to conflict.

(Skipped ModifierType for eg).

12 files changed, 73 insertions, 74 deletions

diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index d49960771d0..9d4731f8da4 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -749,7 +749,7 @@ typedef struct bActionChannel {
 } bActionChannel;
 
 /* Action Channel flags (ONLY USED FOR DO_VERSIONS...) */
-typedef enum ACHAN_FLAG {
+typedef enum eActionChannelFlag {
 	ACHAN_SELECTED  = (1 << 0),
 	ACHAN_HIGHLIGHTED = (1 << 1),
 	ACHAN_HIDDEN    = (1 << 2),
@@ -758,6 +758,6 @@ typedef enum ACHAN_FLAG {
 	ACHAN_SHOWIPO   = (1 << 5),
 	ACHAN_SHOWCONS  = (1 << 6),
 	ACHAN_MOVED     = (1u << 31)
-} ACHAN_FLAG; 
+} eActionChannelFlag;
 
 #endif  /* __DNA_ACTION_TYPES_H__ */
diff --git a/source/blender/makesdna/DNA_boid_types.h b/source/blender/makesdna/DNA_boid_types.h
index f1930ffd643..44764eb012e 100644
--- a/source/blender/makesdna/DNA_boid_types.h
+++ b/source/blender/makesdna/DNA_boid_types.h
@@ -34,7 +34,7 @@
 
 #include "DNA_listBase.h"
 
-typedef enum BoidRuleType {
+typedef enum eBoidRuleType {
 	eBoidRuleType_None = 0,
 	eBoidRuleType_Goal = 1,             /* go to goal assigned object or loudest assigned signal source */
 	eBoidRuleType_Avoid = 2,            /* get away from assigned object or loudest assigned signal source */
@@ -49,7 +49,7 @@ typedef enum BoidRuleType {
 	//eBoidRuleType_FollowPath = 11,    /* move along a assigned curve or closest curve in a group */
 	//eBoidRuleType_FollowWall = 12,    /* move next to a deflector object's in direction of it's tangent */
 	NUM_BOID_RULE_TYPES
-} BoidRuleType;
+} eBoidRuleType;
 
 /* boidrule->flag */
 #define BOIDRULE_CURRENT		1
@@ -96,14 +96,14 @@ typedef struct BoidRuleFight {
 	float distance, flee_distance;
 } BoidRuleFight;
 
-typedef enum BoidMode {
+typedef enum eBoidMode {
 	eBoidMode_InAir = 0,
 	eBoidMode_OnLand = 1,
 	eBoidMode_Climbing = 2,
 	eBoidMode_Falling = 3,
 	eBoidMode_Liftoff = 4,
 	NUM_BOID_MODES
-} BoidMode;
+} eBoidMode;
 
 
 typedef struct BoidData {
@@ -140,12 +140,12 @@ typedef struct BoidData {
 //	int signal_id, channels;
 //} BoidCondition;
 
-typedef enum BoidRulesetType {
+typedef enum eBoidRulesetType {
 	eBoidRulesetType_Fuzzy = 0,
 	eBoidRulesetType_Random = 1,
 	eBoidRulesetType_Average = 2,
 	NUM_BOID_RULESET_TYPES
-} BoidRulesetType;
+} eBoidRulesetType;
 #define BOIDSTATE_CURRENT	1
 typedef struct BoidState {
 	struct BoidState *next, *prev;
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index c285b44c939..407d59f09da 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -105,7 +105,7 @@ typedef struct Brush {
 	char sculpt_tool;       /* active sculpt tool */
 	char vertexpaint_tool;  /* active vertex/weight paint blend mode (poorly named) */
 	char imagepaint_tool;   /* active image paint tool */
-	char mask_tool;         /* enum BrushMaskTool, only used if sculpt_tool is SCULPT_TOOL_MASK */
+	char mask_tool;         /* enum eBrushMaskTool, only used if sculpt_tool is SCULPT_TOOL_MASK */
 
 	float autosmooth_factor;
 
@@ -171,19 +171,19 @@ typedef struct PaintCurve {
 } PaintCurve;
 
 /* Brush.gradient_source */
-typedef enum BrushGradientSourceStroke {
+typedef enum eBrushGradientSourceStroke {
 	BRUSH_GRADIENT_PRESSURE = 0, /* gradient from pressure */
 	BRUSH_GRADIENT_SPACING_REPEAT = 1, /* gradient from spacing */
 	BRUSH_GRADIENT_SPACING_CLAMP = 2 /* gradient from spacing */
-} BrushGradientSourceStroke;
+} eBrushGradientSourceStroke;
 
-typedef enum BrushGradientSourceFill {
+typedef enum eBrushGradientSourceFill {
 	BRUSH_GRADIENT_LINEAR = 0, /* gradient from pressure */
 	BRUSH_GRADIENT_RADIAL = 1 /* gradient from spacing */
-} BrushGradientSourceFill;
+} eBrushGradientSourceFill;
 
 /* Brush.flag */
-typedef enum BrushFlags {
+typedef enum eBrushFlags {
 	BRUSH_AIRBRUSH = (1 << 0),
 	BRUSH_FLAG_DEPRECATED_1 = (1 << 1),
 	BRUSH_ALPHA_PRESSURE = (1 << 2),
@@ -216,7 +216,7 @@ typedef enum BrushFlags {
 	BRUSH_LINE = (1 << 29),
 	BRUSH_ABSOLUTE_JITTER = (1 << 30),
 	BRUSH_CURVE = (1u << 31)
-} BrushFlags;
+} eBrushFlags;
 
 typedef enum {
 	BRUSH_MASK_PRESSURE_RAMP = (1 << 1),
@@ -224,21 +224,21 @@ typedef enum {
 } BrushMaskPressureFlags;
 
 /* Brush.overlay_flags */
-typedef enum OverlayFlags {
+typedef enum eOverlayFlags {
 	BRUSH_OVERLAY_CURSOR = (1),
 	BRUSH_OVERLAY_PRIMARY = (1 << 1),
 	BRUSH_OVERLAY_SECONDARY = (1 << 2),
 	BRUSH_OVERLAY_CURSOR_OVERRIDE_ON_STROKE = (1 << 3),
 	BRUSH_OVERLAY_PRIMARY_OVERRIDE_ON_STROKE = (1 << 4),
 	BRUSH_OVERLAY_SECONDARY_OVERRIDE_ON_STROKE = (1 << 5)
-} OverlayFlags;
+} eOverlayFlags;
 
 #define BRUSH_OVERLAY_OVERRIDE_MASK (BRUSH_OVERLAY_CURSOR_OVERRIDE_ON_STROKE | \
 									 BRUSH_OVERLAY_PRIMARY_OVERRIDE_ON_STROKE | \
 									 BRUSH_OVERLAY_SECONDARY_OVERRIDE_ON_STROKE)
 
 /* Brush.sculpt_tool */
-typedef enum BrushSculptTool {
+typedef enum eBrushSculptTool {
 	SCULPT_TOOL_DRAW = 1,
 	SCULPT_TOOL_SMOOTH = 2,
 	SCULPT_TOOL_PINCH = 3,
@@ -258,7 +258,7 @@ typedef enum BrushSculptTool {
 	SCULPT_TOOL_BLOB = 17,
 	SCULPT_TOOL_CLAY_STRIPS = 18,
 	SCULPT_TOOL_MASK = 19
-} BrushSculptTool;
+} eBrushSculptTool;
 
 /** When #BRUSH_ACCUMULATE is used */
 #define SCULPT_TOOL_HAS_ACCUMULATE(t) ELEM(t, \
@@ -295,14 +295,14 @@ typedef enum BrushSculptTool {
 	) == 0)
 
 /* ImagePaintSettings.tool */
-typedef enum BrushImagePaintTool {
+typedef enum eBrushImagePaintTool {
 	PAINT_TOOL_DRAW = 0,
 	PAINT_TOOL_SOFTEN = 1,
 	PAINT_TOOL_SMEAR = 2,
 	PAINT_TOOL_CLONE = 3,
 	PAINT_TOOL_FILL = 4,
 	PAINT_TOOL_MASK = 5
-} BrushImagePaintTool;
+} eBrushImagePaintTool;
 
 /* direction that the brush displaces along */
 enum {
@@ -343,10 +343,10 @@ typedef enum {
 } BrushMaskTool;
 
 /* blur kernel types, Brush.blur_mode */
-typedef enum BlurKernelType {
+typedef enum eBlurKernelType {
 	KERNEL_GAUSSIAN,
 	KERNEL_BOX
-} BlurKernelType;
+} eBlurKernelType;
 
 /* Brush.falloff_shape */
 enum {
diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h
index f7ee1ff3915..6f9c407c6c6 100644
--- a/source/blender/makesdna/DNA_color_types.h
+++ b/source/blender/makesdna/DNA_color_types.h
@@ -91,7 +91,7 @@ typedef struct CurveMapping {
 #define CUMA_DRAW_SAMPLE		8
 
 /* cumapping->preset */
-typedef enum CurveMappingPreset {
+typedef enum eCurveMappingPreset {
 	CURVE_PRESET_LINE   = 0,
 	CURVE_PRESET_SHARP  = 1,
 	CURVE_PRESET_SMOOTH = 2,
@@ -99,7 +99,7 @@ typedef enum CurveMappingPreset {
 	CURVE_PRESET_MID9   = 4,
 	CURVE_PRESET_ROUND  = 5,
 	CURVE_PRESET_ROOT   = 6,
-} CurveMappingPreset;
+} eCurveMappingPreset;
 
 /* histogram->mode */
 enum {
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index ca774864e95..4c4440ad573 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -92,23 +92,22 @@ typedef struct bConstraintTarget {
 	
 	short space;			/* space that target should be evaluated in (overrides bConstraint->tarspace) */
 	short flag;				/* runtime settings (for editor, etc.) */
-	short type;				/* type of target (B_CONSTRAINT_OB_TYPE) */
+	short type;				/* type of target (eConstraintObType) */
 	short rotOrder;			/* rotation order for target (as defined in BLI_math.h) */
 } bConstraintTarget;
 
 /* bConstraintTarget -> flag */
-typedef enum B_CONSTRAINT_TARGET_FLAG {
+typedef enum eConstraintTargetFlag {
 	CONSTRAINT_TAR_TEMP = (1<<0)		/* temporary target-struct that needs to be freed after use */
-} B_CONSTRAINT_TARGET_FLAG;
+} eConstraintTargetFlag;
 
 /* bConstraintTarget/bConstraintOb -> type */
-typedef enum B_CONSTRAINT_OB_TYPE {
+typedef enum eConstraintObType {
 	CONSTRAINT_OBTYPE_OBJECT = 1,	/*	string is ""				*/
 	CONSTRAINT_OBTYPE_BONE   = 2,	/*	string is bone-name		*/
 	CONSTRAINT_OBTYPE_VERT   = 3,	/*	string is vertex-group name 	*/
 	CONSTRAINT_OBTYPE_CV     = 4	/*	string is vertex-group name - is not available until curves get vgroups */
-} B_CONSTRAINT_OB_TYPE;
-
+} eConstraintObType;
 
 
 /* Python Script Constraint */
@@ -128,7 +127,7 @@ typedef struct bPythonConstraint {
 
 /* Inverse-Kinematics (IK) constraint
  * This constraint supports a variety of mode determine by the type field
- * according to B_CONSTRAINT_IK_TYPE.
+ * according to eConstraint_IK_Type.
  * Some fields are used by all types, some are specific to some types
  * This is indicated in the comments for each field
  */
@@ -145,15 +144,15 @@ typedef struct bKinematicConstraint {
 	float		weight;			/* All: Weight of constraint in IK tree */
 	float		orientweight;	/* CopyPose: Amount of rotation a target applies on chain */
 	float		grabtarget[3];	/* CopyPose: for target-less IK */
-	short		type;			/* subtype of IK constraint: B_CONSTRAINT_IK_TYPE */
+	short		type;			/* subtype of IK constraint: eConstraint_IK_Type */
 	short 		mode;			/* Distance: how to limit in relation to clamping sphere: LIMITDIST_.. */
 	float 		dist;			/* Distance: distance (radius of clamping sphere) from target */
 } bKinematicConstraint;
 
-typedef enum B_CONSTRAINT_IK_TYPE {
+typedef enum eConstraint_IK_Type {
 	CONSTRAINT_IK_COPYPOSE = 0,		/* 'standard' IK constraint: match position and/or orientation of target */
 	CONSTRAINT_IK_DISTANCE = 1		/* maintain distance with target */
-} B_CONSTRAINT_IK_TYPE;
+} eConstraint_IK_Type;
 
 
 /* Spline IK Constraint 
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index 3676066a399..8bb711339f7 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -356,7 +356,7 @@ typedef struct GridPaintMask {
 	int pad;
 } GridPaintMask;
 
-typedef enum MVertSkinFlag {
+typedef enum eMVertSkinFlag {
 	/* Marks a vertex as the edge-graph root, used for calculating rotations for all connected edges (recursively).
 	 * Also used to choose a root when generating an armature.
 	 */
@@ -366,13 +366,13 @@ typedef enum MVertSkinFlag {
 	 * directly hulled together, rather than the default of generating intermediate frames.
 	 */
 	MVERT_SKIN_LOOSE = 2,
-} MVertSkinFlag;
+} eMVertSkinFlag;
 
 typedef struct MVertSkin {
 	/* Radii of the skin, define how big the generated frames are. Currently only the first two elements are used. */
 	float radius[3];
 
-	/* MVertSkinFlag */
+	/* eMVertSkinFlag */
 	int flag;
 } MVertSkin;
 
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 64856b2eb76..7f0547188e9 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1226,19 +1226,19 @@ enum {
 };
 
 /* Remesh modifier */
-typedef enum RemeshModifierFlags {
+typedef enum eRemeshModifierFlags {
 	MOD_REMESH_FLOOD_FILL     = 1,
 	MOD_REMESH_SMOOTH_SHADING = 2,
 } RemeshModifierFlags;
 
-typedef enum RemeshModifierMode {
+typedef enum eRemeshModifierMode {
 	/* blocky */
 	MOD_REMESH_CENTROID       = 0,
 	/* smooth */
 	MOD_REMESH_MASS_POINT     = 1,
 	/* keeps sharp edges */
 	MOD_REMESH_SHARP_FEATURES = 2,
-} RemeshModifierMode;
+} eRemeshModifierMode;
 
 typedef struct RemeshModifierData {
 	ModifierData modifier;
diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h
index ed14c4b9311..6e8d4a0480c 100644
--- a/source/blender/makesdna/DNA_object_force.h
+++ b/source/blender/makesdna/DNA_object_force.h
@@ -39,7 +39,7 @@ extern "C" {
 #include "DNA_listBase.h"
 
 /* pd->forcefield:  Effector Fields types */
-typedef enum PFieldType {
+typedef enum ePFieldType {
 	PFIELD_NULL   = 0,	/* (this is used for general effector weight)							*/
 	PFIELD_FORCE  = 1,	/* Force away/towards a point depending on force strength				*/
 	PFIELD_VORTEX = 2,	/* Force around the effector normal										*/
@@ -56,8 +56,8 @@ typedef enum PFieldType {
 	PFIELD_DRAG       = 12,	/* Linear & quadratic drag												*/
 	PFIELD_SMOKEFLOW  = 13,	/* Force based on smoke simulation air flow								*/
 	NUM_PFIELD_TYPES
-} PFieldType;
-	
+} ePFieldType;
+
 typedef struct PartDeflect {
 	int	  flag;			/* general settings flag										*/
 	short deflect;		/* Deflection flag - does mesh deflect particles				*/
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 0f341aa4001..d08bca4f244 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -668,7 +668,7 @@ enum {
 };
 
 /* ob->mode */
-typedef enum ObjectMode {
+typedef enum eObjectMode {
 	OB_MODE_OBJECT        = 0,
 	OB_MODE_EDIT          = 1 << 0,
 	OB_MODE_SCULPT        = 1 << 1,
@@ -678,7 +678,7 @@ typedef enum ObjectMode {
 	OB_MODE_PARTICLE_EDIT = 1 << 5,
 	OB_MODE_POSE          = 1 << 6,
 	OB_MODE_GPENCIL       = 1 << 7,  /* NOTE: Just a dummy to make the UI nicer */
-} ObjectMode;
+} eObjectMode;
 
 /* any mode where the brush system is used */
 #define OB_MODE_ALL_PAINT (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)
diff --git a/source/blender/makesdna/DNA_packedFile_types.h b/source/blender/makesdna/DNA_packedFile_types.h
index 56140c84cb1..00a54c2db7f 100644
--- a/source/blender/makesdna/DNA_packedFile_types.h
+++ b/source/blender/makesdna/DNA_packedFile_types.h
@@ -40,7 +40,7 @@ typedef struct PackedFile {
 	void *data;
 } PackedFile;
 
-enum PF_FileStatus {
+enum ePF_FileStatus {
 	PF_EQUAL = 0,
 	PF_DIFFERS = 1,
 	PF_NOFILE = 2,
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 3ad75142c46..b9f19a36072 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -99,7 +99,7 @@ typedef struct AviCodecData {
 	char			avicodecname[128];
 } AviCodecData;
 
-typedef enum FFMpegPreset {
+typedef enum eFFMpegPreset {
 	FFM_PRESET_NONE,
 	FFM_PRESET_ULTRAFAST,
 	FFM_PRESET_SUPERFAST,
@@ -110,7 +110,7 @@ typedef enum FFMpegPreset {
 	FFM_PRESET_SLOW,
 	FFM_PRESET_SLOWER,
 	FFM_PRESET_VERYSLOW,
-} FFMpegPreset;
+} eFFMpegPreset;
 
 
 /* Mapping from easily-understandable descriptions to CRF values.
@@ -119,7 +119,7 @@ typedef enum FFMpegPreset {
  * We use a slightly wider than "subjectively sane range" according
  * to https://trac.ffmpeg.org/wiki/Encode/H.264#a1.ChooseaCRFvalue
  */
-typedef enum FFMpegCrf {
+typedef enum eFFMpegCrf {
 	FFM_CRF_NONE = -1,
 	FFM_CRF_LOSSLESS = 0,
 	FFM_CRF_PERC_LOSSLESS = 17,
@@ -128,7 +128,7 @@ typedef enum FFMpegCrf {
 	FFM_CRF_LOW = 26,
 	FFM_CRF_VERYLOW = 29,
 	FFM_CRF_LOWEST = 32,
-} FFMpegCrf;
+} eFFMpegCrf;
 
 typedef struct FFMpegCodecData {
 	int type;
@@ -144,7 +144,7 @@ typedef struct FFMpegCodecData {
 	int max_b_frames; /* only used if FFMPEG_USE_MAX_B_FRAMES flag is set. */
 	int flags;
 	int constant_rate_factor;
-	int ffmpeg_preset; /* see FFMpegPreset */
+	int ffmpeg_preset; /* see eFFMpegPreset */
 
 	int rc_min_rate;
 	int rc_max_rate;
@@ -217,7 +217,7 @@ typedef struct SceneRenderLayer {
 #define SCE_LAY_NEG_ZMASK	0x80000
 
 /* srl->passflag */
-typedef enum ScenePassType {
+typedef enum eScenePassType {
 	SCE_PASS_COMBINED                 = (1 << 0),
 	SCE_PASS_Z                        = (1 << 1),
 	SCE_PASS_RGBA                     = (1 << 2),
@@ -249,7 +249,7 @@ typedef enum ScenePassType {
 	SCE_PASS_SUBSURFACE_DIRECT        = (1 << 28),
 	SCE_PASS_SUBSURFACE_INDIRECT      = (1 << 29),
 	SCE_PASS_SUBSURFACE_COLOR         = (1 << 30),
-} ScenePassType;
+} eScenePassType;
 
 #define RE_PASSNAME_COMBINED "Combined"
 #define RE_PASSNAME_Z "Depth"
@@ -511,23 +511,23 @@ typedef struct BakeData {
 } BakeData;
 
 /* (char) normal_swizzle */
-typedef enum BakeNormalSwizzle {
+typedef enum eBakeNormalSwizzle {
 	R_BAKE_POSX = 0,
 	R_BAKE_POSY = 1,
 	R_BAKE_POSZ = 2,
 	R_BAKE_NEGX = 3,
 	R_BAKE_NEGY = 4,
 	R_BAKE_NEGZ = 5,
-} BakeNormalSwizzle;
+} eBakeNormalSwizzle;
 
 /* (char) save_mode */
-typedef enum BakeSaveMode {
+typedef enum eBakeSaveMode {
 	R_BAKE_SAVE_INTERNAL = 0,
 	R_BAKE_SAVE_EXTERNAL = 1,
-} BakeSaveMode;
+} eBakeSaveMode;
 
 /* bake->pass_filter */
-typedef enum BakePassFilter {
+typedef enum eBakePassFilter {
 	R_BAKE_PASS_FILTER_NONE           = 0,
 	R_BAKE_PASS_FILTER_AO             = (1 << 0),
 	R_BAKE_PASS_FILTER_EMIT           = (1 << 1),
@@ -538,7 +538,7 @@ typedef enum BakePassFilter {
 	R_BAKE_PASS_FILTER_DIRECT         = (1 << 6),
 	R_BAKE_PASS_FILTER_INDIRECT       = (1 << 7),
 	R_BAKE_PASS_FILTER_COLOR          = (1 << 8),
-} BakePassFilter;
+} eBakePassFilter;
 
 #define R_BAKE_PASS_FILTER_ALL (~0)
 
@@ -972,12 +972,12 @@ enum {
 #define STEREO_RIGHT_SUFFIX "_R"
 #define STEREO_LEFT_SUFFIX "_L"
 
-typedef enum StereoViews {
+typedef enum eStereoViews {
 	STEREO_LEFT_ID = 0,
 	STEREO_RIGHT_ID = 1,
 	STEREO_3D_ID = 2,
 	STEREO_MONO_ID = 3,
-} StereoViews;
+} eStereoViews;
 
 /* *************************************************************** */
 /* Markers */
@@ -1005,7 +1005,7 @@ typedef struct Paint {
 	void *paint_cursor;
 	unsigned char paint_cursor_col[4];
 
-	/* enum PaintFlags */
+	/* enum ePaintFlags */
 	int flags;
 
 	/* Paint stroke can use up to PAINT_MAX_INPUT_SAMPLES inputs to
@@ -1351,7 +1351,7 @@ typedef enum {
 	/* only used if unified alpha is enabled, mirrors the brush flag
 	 * BRUSH_ALPHA_PRESSURE */
 	UNIFIED_PAINT_BRUSH_ALPHA_PRESSURE  = (1 << 4)
-} UnifiedPaintSettingsFlags;
+} eUnifiedPaintSettingsFlags;
 
 
 typedef struct CurvePaintSettings {
@@ -2065,16 +2065,16 @@ enum {
 };
 
 /* Paint.flags */
-typedef enum {
+typedef enum ePaintFlags {
 	PAINT_SHOW_BRUSH = (1 << 0),
 	PAINT_FAST_NAVIGATE = (1 << 1),
 	PAINT_SHOW_BRUSH_ON_SURFACE = (1 << 2),
 	PAINT_USE_CAVITY_MASK = (1 << 3)
-} PaintFlags;
+} ePaintFlags;
 
 /* Paint.symmetry_flags
  * (for now just a duplicate of sculpt symmetry flags) */
-typedef enum SymmetryFlags {
+typedef enum ePaintSymmetryFlags {
 	PAINT_SYMM_X = (1 << 0),
 	PAINT_SYMM_Y = (1 << 1),
 	PAINT_SYMM_Z = (1 << 2),
@@ -2082,13 +2082,13 @@ typedef enum SymmetryFlags {
 	PAINT_TILE_X = (1 << 4),
 	PAINT_TILE_Y = (1 << 5),
 	PAINT_TILE_Z = (1 << 6),
-} SymmetryFlags;
+} ePaintSymmetryFlags;
 
 #define PAINT_SYMM_AXIS_ALL (PAINT_SYMM_X | PAINT_SYMM_Y | PAINT_SYMM_Z)
 
 /* Sculpt.flags */
 /* These can eventually be moved to paint flags? */
-typedef enum SculptFlags {
+typedef enum eSculptFlags {
 #ifdef DNA_DEPRECATED
 	/* deprecated, part of paint struct symmetry_flags now */
 	SCULPT_SYMM_X = (1 << 0),
@@ -2118,12 +2118,12 @@ typedef enum SculptFlags {
 	/* If set, dynamic-topology detail size will be constant in object space */
 	SCULPT_DYNTOPO_DETAIL_CONSTANT = (1 << 13),
 	SCULPT_DYNTOPO_DETAIL_BRUSH = (1 << 14),
-} SculptFlags;
+} eSculptFlags;
 
-typedef enum ImagePaintMode {
+typedef enum eImageePaintMode {
 	IMAGEPAINT_MODE_MATERIAL, /* detect texture paint slots from the material */
 	IMAGEPAINT_MODE_IMAGE,    /* select texture paint image directly */
-} ImagePaintMode;
+} eImageePaintMode;
 
 /* ImagePaintSettings.flag */
 #define IMAGEPAINT_DRAWING				1
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index d6490d99016..a0f77d61d1d 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -664,7 +664,7 @@ typedef struct FSMenuEntry {
 } FSMenuEntry;
 
 /* FileSelectParams.display */
-enum FileDisplayTypeE {
+enum eFileDisplayType {
 	FILE_DEFAULTDISPLAY = 0,
 	FILE_SHORTDISPLAY = 1,
 	FILE_LONGDISPLAY = 2,
@@ -672,7 +672,7 @@ enum FileDisplayTypeE {
 };
 
 /* FileSelectParams.sort */
-enum FileSortTypeE {
+enum eFileSortType {
 	FILE_SORT_NONE = 0,
 	FILE_SORT_ALPHA = 1,
 	FILE_SORT_EXTENSION = 2,