Cleanup: unused enums

25 files changed, 73 insertions, 174 deletions

diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index a75b01f2f75..d0ba2b0c4e5 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -112,24 +112,6 @@ enum {
   IDP_STRING_SUB_BYTE = 1, /* arbitrary byte array, _not_ null terminated */
 };
 
-/* IDP_GROUP */
-enum {
-  /** Default. */
-  IDP_GROUP_SUB_NONE = 0,
-  /** Object mode settings. */
-  IDP_GROUP_SUB_MODE_OBJECT = 1,
-  /** Mesh edit mode settings. */
-  IDP_GROUP_SUB_MODE_EDIT = 2,
-  /** Render engine settings. */
-  IDP_GROUP_SUB_ENGINE_RENDER = 3,
-  /** Data override. */
-  IDP_GROUP_SUB_OVERRIDE = 4,
-  /** Weight paint mode settings. */
-  IDP_GROUP_SUB_MODE_PAINT_WEIGHT = 5,
-  /** Vertex paint mode settings. */
-  IDP_GROUP_SUB_MODE_PAINT_VERTEX = 6,
-};
-
 /*->flag*/
 enum {
   /** This IDProp may be statically overridden.
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index b95a4ca3d96..64a458cbbc5 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -158,13 +158,13 @@ typedef enum eMotionPaths_ViewFlag {
   /* find keyframes in whole action (instead of just in matching group name) */
   MOTIONPATH_VIEW_KFACT = (1 << 3),
   /* draw lines on path */
-  MOTIONPATH_VIEW_LINES = (1 << 4),
+  /* MOTIONPATH_VIEW_LINES = (1 << 4), */ /* UNUSED */
 } eMotionPath_ViewFlag;
 
 /* bAnimVizSettings->path_bakeflag */
 typedef enum eMotionPaths_BakeFlag {
   /** motion paths directly associated with this block of settings needs updating */
-  MOTIONPATH_BAKE_NEEDS_RECALC = (1 << 0),
+  /* MOTIONPATH_BAKE_NEEDS_RECALC = (1 << 0), */ /* UNUSED */
   /** 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,
@@ -364,7 +364,7 @@ typedef enum ePchan_Flag {
   POSE_DONE = (1 << 10),
   /* visualization */
   POSE_KEY = (1 << 11),
-  POSE_STRIDE = (1 << 12),
+  /* POSE_STRIDE = (1 << 12), */ /* UNUSED */
   /* standard IK solving */
   POSE_IKTREE = (1 << 13),
 #if 0
@@ -380,10 +380,10 @@ typedef enum ePchan_ConstFlag {
   PCHAN_HAS_IK = (1 << 0),
   PCHAN_HAS_CONST = (1 << 1),
   /* only used for drawing Posemode, not stored in channel */
-  PCHAN_HAS_ACTION = (1 << 2),
+  /* PCHAN_HAS_ACTION = (1 << 2), */ /* UNUSED */
   PCHAN_HAS_TARGET = (1 << 3),
   /* only for drawing Posemode too */
-  PCHAN_HAS_STRIDE = (1 << 4),
+  /* PCHAN_HAS_STRIDE = (1 << 4), */ /* UNUSED */
   /* spline IK */
   PCHAN_HAS_SPLINEIK = (1 << 5),
 } ePchan_ConstFlag;
@@ -510,7 +510,7 @@ typedef enum ePose_Flags {
   /* pose has constraints which depend on time (used when depsgraph updates for a new frame) */
   POSE_CONSTRAINTS_TIMEDEPEND = (1 << 3),
   /* recalculate bone paths */
-  POSE_RECALCPATHS = (1 << 4),
+  /* POSE_RECALCPATHS = (1 << 4), */ /* UNUSED */
   /* set by BKE_pose_rebuild to give a chance to the IK solver to rebuild IK tree */
   POSE_WAS_REBUILT = (1 << 5),
   POSE_FLAG_DEPRECATED = (1 << 6), /* deprecated. */
@@ -683,8 +683,8 @@ typedef enum eAction_Flags {
 
   /* flags for evaluation/editing */
   ACT_MUTED = (1 << 9),
-  ACT_PROTECTED = (1 << 10),
-  ACT_DISABLED = (1 << 11),
+  /* ACT_PROTECTED = (1 << 10), */ /* UNUSED */
+  /* ACT_DISABLED = (1 << 11), */  /* UNUSED */
 } eAction_Flags;
 
 /* ************************************************ */
@@ -767,10 +767,12 @@ typedef enum eDopeSheet_FilterFlag {
   /** GP Mode - Only show datablocks used in the scene */
   ADS_FILTER_GP_3DONLY = (1 << 29),
 
+#if 0
   /** 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_NOSPK | ADS_FILTER_NOMODIFIERS),
+#endif
 } eDopeSheet_FilterFlag;
 
 /* DopeSheet filter-flags - Overflow (filterflag2) */
@@ -947,18 +949,6 @@ typedef struct bActionChannel {
   int temp;
 } bActionChannel;
 
-/* Action Channel flags (ONLY USED FOR DO_VERSIONS...) */
-typedef enum eActionChannelFlag {
-  ACHAN_SELECTED = (1 << 0),
-  ACHAN_HIGHLIGHTED = (1 << 1),
-  ACHAN_HIDDEN = (1 << 2),
-  ACHAN_PROTECTED = (1 << 3),
-  ACHAN_EXPANDED = (1 << 4),
-  ACHAN_SHOWIPO = (1 << 5),
-  ACHAN_SHOWCONS = (1 << 6),
-  ACHAN_MOVED = (1u << 31),
-} eActionChannelFlag;
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h
index 70add4c156f..7cf49053918 100644
--- a/source/blender/makesdna/DNA_anim_types.h
+++ b/source/blender/makesdna/DNA_anim_types.h
@@ -799,7 +799,7 @@ typedef enum eNlaStrip_Flag {
   /** NLA strip is muted (i.e. doesn't contribute in any way) */
   NLASTRIP_FLAG_MUTED = (1 << 12),
   /** NLA Strip is played back in 'ping-pong' style */
-  NLASTRIP_FLAG_MIRROR = (1 << 13),
+  /* NLASTRIP_FLAG_MIRROR = (1 << 13), */ /* UNUSED */
 
   /* temporary editing flags */
   /** NLA strip should ignore frame range and hold settings, and evaluate at global time. */
@@ -922,7 +922,7 @@ typedef enum eKSP_Grouping {
   KSP_GROUP_KSNAME,
   /** 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, */ /* UNUSED */
 } eKSP_Grouping;
 
 /* ---------------- */
@@ -970,7 +970,7 @@ 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), */ /* UNUSED */
   /** Keyingset does not depend on context info (i.e. paths are absolute). */
   KEYINGSET_ABSOLUTE = (1 << 1),
 } eKS_Settings;
@@ -985,7 +985,7 @@ typedef enum eInsertKeyFlags {
   /** don't recalculate handles,etc. after adding key */
   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), */ /* UNUSED */
   /** only replace an existing keyframe (this overrides INSERTKEY_NEEDED) */
   INSERTKEY_REPLACE = (1 << 4),
   /** transform F-Curves should have XYZ->RGB color mode */
@@ -1110,7 +1110,7 @@ typedef enum eAnimData_Flag {
   /** Drivers expanded in UI. */
   ADT_DRIVERS_COLLAPSED = (1 << 10),
   /** Don't execute drivers. */
-  ADT_DRIVERS_DISABLED = (1 << 11),
+  /* ADT_DRIVERS_DISABLED = (1 << 11), */ /* UNUSED */
 
   /** AnimData block is selected in UI. */
   ADT_UI_SELECTED = (1 << 14),
diff --git a/source/blender/makesdna/DNA_boid_types.h b/source/blender/makesdna/DNA_boid_types.h
index 47fe7d35596..de93c734bb4 100644
--- a/source/blender/makesdna/DNA_boid_types.h
+++ b/source/blender/makesdna/DNA_boid_types.h
@@ -54,7 +54,6 @@ typedef enum eBoidRuleType {
   /** move next to a deflector object's in direction of it's tangent */
   eBoidRuleType_FollowWall = 12,
 #endif
-  NUM_BOID_RULE_TYPES,
 } eBoidRuleType;
 
 /* boidrule->flag */
@@ -108,7 +107,6 @@ typedef enum eBoidMode {
   eBoidMode_Climbing = 2,
   eBoidMode_Falling = 3,
   eBoidMode_Liftoff = 4,
-  NUM_BOID_MODES,
 } eBoidMode;
 
 typedef struct BoidData {
@@ -149,7 +147,6 @@ typedef enum eBoidRulesetType {
   eBoidRulesetType_Fuzzy = 0,
   eBoidRulesetType_Random = 1,
   eBoidRulesetType_Average = 2,
-  NUM_BOID_RULESET_TYPES,
 } eBoidRulesetType;
 #define BOIDSTATE_CURRENT 1
 typedef struct BoidState {
diff --git a/source/blender/makesdna/DNA_cachefile_types.h b/source/blender/makesdna/DNA_cachefile_types.h
index bc57202367c..1175c7f0dc0 100644
--- a/source/blender/makesdna/DNA_cachefile_types.h
+++ b/source/blender/makesdna/DNA_cachefile_types.h
@@ -38,10 +38,12 @@ enum {
   CACHEFILE_UNUSED_0 = (1 << 1),
 };
 
+#if 0 /* UNUSED */
 /* CacheFile::draw_flag */
 enum {
   CACHEFILE_KEYFRAME_DRAWN = (1 << 0),
 };
+#endif
 
 /* Representation of an object's path inside the Alembic file.
  * Note that this is not a file path. */
@@ -74,7 +76,7 @@ typedef struct CacheFile {
 
   /** Animation flag. */
   short flag;
-  short draw_flag;
+  short draw_flag; /* UNUSED */
 
   char _pad[4];
 
diff --git a/source/blender/makesdna/DNA_collection_types.h b/source/blender/makesdna/DNA_collection_types.h
index af543864536..6d48c029437 100644
--- a/source/blender/makesdna/DNA_collection_types.h
+++ b/source/blender/makesdna/DNA_collection_types.h
@@ -78,12 +78,12 @@ typedef struct Collection {
 
 /* Collection->flag */
 enum {
-  COLLECTION_RESTRICT_VIEWPORT = (1 << 0),   /* Disable in viewports. */
-  COLLECTION_RESTRICT_SELECT = (1 << 1),     /* Not selectable in viewport. */
-  COLLECTION_DISABLED_DEPRECATED = (1 << 2), /* Not used anymore */
-  COLLECTION_RESTRICT_RENDER = (1 << 3),     /* Disable in renders. */
-  COLLECTION_HAS_OBJECT_CACHE = (1 << 4),    /* Runtime: object_cache is populated. */
-  COLLECTION_IS_MASTER = (1 << 5),           /* Is master collection embedded in the scene. */
+  COLLECTION_RESTRICT_VIEWPORT = (1 << 0),         /* Disable in viewports. */
+  COLLECTION_RESTRICT_SELECT = (1 << 1),           /* Not selectable in viewport. */
+  /* COLLECTION_DISABLED_DEPRECATED = (1 << 2), */ /* Not used anymore */
+  COLLECTION_RESTRICT_RENDER = (1 << 3),           /* Disable in renders. */
+  COLLECTION_HAS_OBJECT_CACHE = (1 << 4),          /* Runtime: object_cache is populated. */
+  COLLECTION_IS_MASTER = (1 << 5), /* Is master collection embedded in the scene. */
 };
 
 /* Collection->tag */
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index f816041010b..6caa0ac5a74 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -125,7 +125,7 @@ typedef enum eConstraintObType {
   /** string is vertex-group name */
   CONSTRAINT_OBTYPE_VERT = 3,
   /** string is vertex-group name - is not available until curves get vgroups */
-  CONSTRAINT_OBTYPE_CV = 4,
+  /* CONSTRAINT_OBTYPE_CV = 4, */ /* UNUSED */
 } eConstraintObType;
 
 /* Python Script Constraint */
@@ -726,13 +726,6 @@ typedef enum eBConstraint_SpaceTypes {
   CONSTRAINT_SPACE_INVALID = 4, /* do not exchange for anything! */
 } eBConstraint_SpaceTypes;
 
-/* bConstraintChannel.flag */
-// XXX deprecated... old AnimSys
-typedef enum eConstraintChannel_Flags {
-  CONSTRAINT_CHANNEL_SELECT = (1 << 0),
-  CONSTRAINT_CHANNEL_PROTECTED = (1 << 1),
-} eConstraintChannel_Flags;
-
 /* Common enum for constraints that support override. */
 typedef enum eConstraint_EulerOrder {
   /** Automatic euler mode. */
@@ -1047,7 +1040,7 @@ typedef enum 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), */ /* UNUSED */
   /* for all Limit constraints - allow to be used during transform? */
   LIMIT_TRANSFORM = (1 << 1),
 } eTransformLimits_Flags2;
diff --git a/source/blender/makesdna/DNA_curveprofile_types.h b/source/blender/makesdna/DNA_curveprofile_types.h
index 6614fdaf589..63e1049b636 100644
--- a/source/blender/makesdna/DNA_curveprofile_types.h
+++ b/source/blender/makesdna/DNA_curveprofile_types.h
@@ -76,10 +76,10 @@ typedef struct CurveProfile {
 
 /** #CurveProfile.flag */
 enum {
-  PROF_USE_CLIP = (1 << 0),              /* Keep control points inside bounding rectangle. */
-  PROF_SYMMETRY_MODE = (1 << 1),         /* Unused for now. */
-  PROF_SAMPLE_STRAIGHT_EDGES = (1 << 2), /* Sample extra points on straight edges. */
-  PROF_SAMPLE_EVEN_LENGTHS = (1 << 3),   /* Put segments evenly spaced along the path. */
+  PROF_USE_CLIP = (1 << 0),                    /* Keep control points inside bounding rectangle. */
+  /* PROF_SYMMETRY_MODE = (1 << 1),         */ /* Unused for now. */
+  PROF_SAMPLE_STRAIGHT_EDGES = (1 << 2),       /* Sample extra points on straight edges. */
+  PROF_SAMPLE_EVEN_LENGTHS = (1 << 3),         /* Put segments evenly spaced along the path. */
 };
 
 typedef enum eCurveProfilePresets {
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index f70dc19616b..552de61df8a 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -120,9 +120,9 @@ typedef enum CustomDataType {
   CD_MLOOPCOL = 17,
   CD_TANGENT = 18,
   CD_MDISPS = 19,
-  CD_PREVIEW_MCOL = 20, /* for displaying weightpaint colors */
-                        /*  CD_ID_MCOL          = 21, */
-  CD_TEXTURE_MLOOPCOL = 22,
+  CD_PREVIEW_MCOL = 20,           /* for displaying weightpaint colors */
+                                  /*  CD_ID_MCOL          = 21, */
+  /* CD_TEXTURE_MLOOPCOL = 22, */ /* UNUSED */
   CD_CLOTH_ORCO = 23,
   CD_RECAST = 24,
 
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index 1c2008749b6..8908b3c42d9 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -131,7 +131,7 @@ typedef struct bGPDpalettecolor {
 /* bGPDpalettecolor->flag */
 typedef enum eGPDpalettecolor_Flag {
   /* color is active */
-  PC_COLOR_ACTIVE = (1 << 0),
+  /* PC_COLOR_ACTIVE = (1 << 0), */ /* UNUSED */
   /* don't display color */
   PC_COLOR_HIDE = (1 << 1),
   /* protected from further editing */
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index 9a6cb24796f..73a9e7f8a0a 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -223,7 +223,7 @@ enum {
 
 /* Image.source, where the image comes from */
 enum {
-  IMA_SRC_CHECK = 0,
+  /* IMA_SRC_CHECK = 0, */ /* UNUSED */
   IMA_SRC_FILE = 1,
   IMA_SRC_SEQUENCE = 2,
   IMA_SRC_MOVIE = 3,
diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h
index 7fc319b849a..5480bed51e8 100644
--- a/source/blender/makesdna/DNA_layer_types.h
+++ b/source/blender/makesdna/DNA_layer_types.h
@@ -149,7 +149,7 @@ enum {
    Keep it synced with base->flag based on g_base_collection_flags. */
 enum {
   LAYER_COLLECTION_HAS_OBJECTS = (1 << 0),
-  LAYER_COLLECTION_VISIBLE_DEPSGRAPH = (1 << 1),
+  /* LAYER_COLLECTION_VISIBLE_DEPSGRAPH = (1 << 1), */ /* UNUSED */
   LAYER_COLLECTION_RESTRICT_VIEWPORT = (1 << 2),
   LAYER_COLLECTION_VISIBLE_VIEW_LAYER = (1 << 4),
 };
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 2d625e7006b..572a9fd76ba 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -425,7 +425,7 @@ enum {
   MOD_BEVEL_WEIGHT = (1 << 4),
   MOD_BEVEL_VGROUP = (1 << 5),
   MOD_BEVEL_CUSTOM_PROFILE = (1 << 7),
-  MOD_BEVEL_SAMPLE_STRAIGHT = (1 << 8),
+  /* MOD_BEVEL_SAMPLE_STRAIGHT = (1 << 8), */ /* UNUSED */
   /*  unused                  = (1 << 9), */
   /*  unused                  = (1 << 10), */
   /*  unused                  = (1 << 11), */
@@ -559,11 +559,6 @@ typedef struct UVProjectModifierData {
 
 #define MOD_UVPROJECT_MAXPROJECTORS 10
 
-/* UVProjectModifierData->flags */
-enum {
-  MOD_UVPROJECT_OVERRIDEIMAGE = (1 << 0),
-};
-
 typedef struct DecimateModifierData {
   ModifierData modifier;
 
@@ -916,11 +911,6 @@ enum {
   MOD_MDEF_DYNAMIC_BIND = (1 << 1),
 };
 
-enum {
-  MOD_MDEF_VOLUME = 0,
-  MOD_MDEF_SURFACE = 1,
-};
-
 typedef struct ParticleSystemModifierData {
   ModifierData modifier;
 
@@ -2034,8 +2024,8 @@ enum {
   /* This indicates "do bind on next modifier evaluation" as well as "is bound". */
   MOD_SDEF_BIND = (1 << 0),
 
-  MOD_SDEF_USES_LOOPTRI = (1 << 1),
-  MOD_SDEF_HAS_CONCAVE = (1 << 2),
+  /* MOD_SDEF_USES_LOOPTRI = (1 << 1), */ /* UNUSED */
+  /* MOD_SDEF_HAS_CONCAVE = (1 << 2), */  /* UNUSED */
 };
 
 /* Surface Deform vertex bind modes */
diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h
index 5548a8405f9..92fa9973759 100644
--- a/source/blender/makesdna/DNA_movieclip_types.h
+++ b/source/blender/makesdna/DNA_movieclip_types.h
@@ -179,12 +179,6 @@ enum {
   MCLIP_SRC_MOVIE = 2,
 };
 
-/* MovieClip->selection types */
-enum {
-  MCLIP_SEL_NONE = 0,
-  MCLIP_SEL_TRACK = 1,
-};
-
 /* MovieClip->flag */
 enum {
   MCLIP_USE_PROXY = (1 << 0),
diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h
index f634e7af5d0..6bf4a92514e 100644
--- a/source/blender/makesdna/DNA_nla_types.h
+++ b/source/blender/makesdna/DNA_nla_types.h
@@ -97,16 +97,13 @@ typedef enum eActStrip_Flag {
   ACTSTRIP_SELECT = (1 << 0),
   ACTSTRIP_USESTRIDE = (1 << 1),
   /* Not implemented. Is not used anywhere */
-  ACTSTRIP_BLENDTONEXT = (1 << 2),
+  /* ACTSTRIP_BLENDTONEXT = (1 << 2), */ /* UNUSED */
   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),
 } eActStrip_Flag;
 
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 071dc70af55..5f7c42b7521 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -573,13 +573,6 @@ enum {
 };
 
 enum {
-  CMP_NODE_LENSFLARE_GHOST = (1 << 0),
-  CMP_NODE_LENSFLARE_GLOW = (1 << 1),
-  CMP_NODE_LENSFLARE_CIRCLE = (1 << 2),
-  CMP_NODE_LENSFLARE_STREAKS = (1 << 3),
-};
-
-enum {
   CMP_NODE_DILATEERODE_STEP = 0,
   CMP_NODE_DILATEERODE_DISTANCE_THRESH = 1,
   CMP_NODE_DILATEERODE_DISTANCE = 2,
diff --git a/source/blender/makesdna/DNA_object_fluidsim_types.h b/source/blender/makesdna/DNA_object_fluidsim_types.h
index 4e821ad5f07..1140a837e23 100644
--- a/source/blender/makesdna/DNA_object_fluidsim_types.h
+++ b/source/blender/makesdna/DNA_object_fluidsim_types.h
@@ -176,12 +176,6 @@ typedef struct FluidsimSettings {
 #define OB_FLUIDSIM_ACTIVE (1 << 1)
 #define OB_FLUIDSIM_OVERRIDE_TIME (1 << 2)
 
-#define OB_FLUIDSIM_SURF_DIR_DEFAULT "cache_fluid"
-#define OB_FLUIDSIM_SURF_PREVIEW_OBJ_FNAME "fluidsurface_preview_####.bobj.gz"
-#define OB_FLUIDSIM_SURF_FINAL_OBJ_FNAME "fluidsurface_final_####.bobj.gz"
-#define OB_FLUIDSIM_SURF_FINAL_VEL_FNAME "fluidsurface_final_####.bvel.gz"
-#define OB_FLUIDSIM_SURF_PARTICLES_FNAME "fluidsurface_particles_####.gz"
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index cbed2af7df2..b142939eaeb 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -543,7 +543,7 @@ enum {
   OB_AXIS = 1 << 1,
   OB_TEXSPACE = 1 << 2,
   OB_DRAWNAME = 1 << 3,
-  OB_DRAWIMAGE = 1 << 4,
+  /* OB_DRAWIMAGE = 1 << 4, */ /* UNUSED */
   /* for solid+wire display */
   OB_DRAWWIRE = 1 << 5,
   /* for overdraw s*/
@@ -579,19 +579,12 @@ enum {
   OB_BOUND_SPHERE = 1,
   OB_BOUND_CYLINDER = 2,
   OB_BOUND_CONE = 3,
-  OB_BOUND_TRIANGLE_MESH = 4,
-  OB_BOUND_CONVEX_HULL = 5,
+  /* OB_BOUND_TRIANGLE_MESH = 4, */  /* UNUSED */
+  /* OB_BOUND_CONVEX_HULL = 5, */    /* UNUSED */
   /*  OB_BOUND_DYN_MESH      = 6, */ /*UNUSED*/
   OB_BOUND_CAPSULE = 7,
 };
 
-/* lod flags */
-enum {
-  OB_LOD_USE_MESH = 1 << 0,
-  OB_LOD_USE_MAT = 1 << 1,
-  OB_LOD_USE_HYST = 1 << 2,
-};
-
 /* **************** BASE ********************* */
 
 /* base->flag_legacy */
@@ -646,13 +639,13 @@ enum {
   /* object-channel expanded status */
   OB_ADS_COLLAPSED = 1 << 10,
   /* object's ipo-block */
-  OB_ADS_SHOWIPO = 1 << 11,
+  /* OB_ADS_SHOWIPO = 1 << 11, */ /* UNUSED */
   /* object's constraint channels */
-  OB_ADS_SHOWCONS = 1 << 12,
+  /* OB_ADS_SHOWCONS = 1 << 12, */ /* UNUSED */
   /* object's material channels */
-  OB_ADS_SHOWMATS = 1 << 13,
+  /* OB_ADS_SHOWMATS = 1 << 13, */ /* UNUSED */
   /* object's marticle channels */
-  OB_ADS_SHOWPARTS = 1 << 14,
+  /* OB_ADS_SHOWPARTS = 1 << 14, */ /* UNUSED */
 };
 
 /* ob->protectflag */
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 373c193b4ab..89c90a1d7f9 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -413,9 +413,9 @@ typedef enum eParticleDrawFlag {
   PART_DRAW_HEALTH = (1 << 4),
   PART_ABS_PATH_TIME = (1 << 5),
   PART_DRAW_COUNT_GR = (1 << 6),
-  PART_DRAW_BB_LOCK = (1 << 7),
-  /* used with billboards */      /* DEPRECATED */
-  PART_DRAW_ROTATE_OB = (1 << 7), /* used with instance object/collection */
+  /* PART_DRAW_BB_LOCK = (1 << 7), */ /* DEPRECATED */
+  /* used with billboards */          /* DEPRECATED */
+  PART_DRAW_ROTATE_OB = (1 << 7),     /* used with instance object/collection */
   PART_DRAW_PARENT = (1 << 8),
   PART_DRAW_NUM = (1 << 9),
   PART_DRAW_RAND_GR = (1 << 10),
@@ -451,14 +451,14 @@ enum {
 
 /* Mirroring Mantaflow particle types from particle.h (Mantaflow header). */
 enum {
-  PARTICLE_TYPE_NONE = (0 << 0),
-  PARTICLE_TYPE_NEW = (1 << 0),
+  /* PARTICLE_TYPE_NONE = (0 << 0), */ /* UNUSED */
+  /* PARTICLE_TYPE_NEW = (1 << 0), */  /* UNUSED */
   PARTICLE_TYPE_SPRAY = (1 << 1),
   PARTICLE_TYPE_BUBBLE = (1 << 2),
   PARTICLE_TYPE_FOAM = (1 << 3),
   PARTICLE_TYPE_TRACER = (1 << 4),
   PARTICLE_TYPE_DELETE = (1 << 10),
-  PARTICLE_TYPE_INVALID = (1 << 30),
+  /* PARTICLE_TYPE_INVALID = (1 << 30), */ /* UNUSED */
 };
 
 /* part->flag */
diff --git a/source/blender/makesdna/DNA_rigidbody_types.h b/source/blender/makesdna/DNA_rigidbody_types.h
index ff4ada613c5..0a60d84a58a 100644
--- a/source/blender/makesdna/DNA_rigidbody_types.h
+++ b/source/blender/makesdna/DNA_rigidbody_types.h
@@ -91,7 +91,7 @@ typedef enum eRigidBodyWorld_Flag {
   /* should sim world be skipped when evaluating (user setting) */
   RBW_FLAG_MUTED = (1 << 0),
   /* sim data needs to be rebuilt */
-  RBW_FLAG_NEEDS_REBUILD = (1 << 1),
+  /* RBW_FLAG_NEEDS_REBUILD = (1 << 1), */ /* UNUSED */
   /* usse split impulse when stepping the simulation */
   RBW_FLAG_USE_SPLIT_IMPULSE = (1 << 2),
 } eRigidBodyWorld_Flag;
@@ -307,24 +307,24 @@ typedef enum eRigidBodyCon_Type {
   /** lets bodies rotate around a specified axis */
   RBC_TYPE_HINGE,
   /** simulates wheel suspension */
-  RBC_TYPE_HINGE2,
+  /* RBC_TYPE_HINGE2, */ /* UNUSED */
   /** restricts movent to a specified axis */
   RBC_TYPE_SLIDER,
-  /** lets object rotate within a cpecified cone */
-  RBC_TYPE_CONE_TWIST,
+  /** lets object rotate within a specified cone */
+  /* RBC_TYPE_CONE_TWIST, */ /* UNUSED */
   /** allows user to specify constraint axes */
   RBC_TYPE_6DOF,
   /** like 6DOF but has springs */
   RBC_TYPE_6DOF_SPRING,
   /** simulates a universal joint */
-  RBC_TYPE_UNIVERSAL,
+  /* RBC_TYPE_UNIVERSAL, */ /* UNUSED */
   /** glues two bodies together */
   RBC_TYPE_FIXED,
   /** similar to slider but also allows rotation around slider axis */
   RBC_TYPE_PISTON,
   /** Simplified spring constraint with only once axis that's
    * automatically placed between the connected bodies */
-  RBC_TYPE_SPRING,
+  /* RBC_TYPE_SPRING, */ /* UNUSED */
   /** dirves bodies by applying linear and angular forces */
   RBC_TYPE_MOTOR,
 } eRigidBodyCon_Type;
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index f66ce132edb..7cd6b5f5013 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -594,12 +594,6 @@ typedef enum eBakePassFilter {
 
 #define R_BAKE_PASS_FILTER_ALL (~0)
 
-/* RenderEngineSettingsClay.options */
-typedef enum ClayFlagSettings {
-  CLAY_USE_AO = (1 << 0),
-  CLAY_USE_HSV = (1 << 1),
-} ClayFlagSettings;
-
 /* *************************************************************** */
 /* Render Data */
 
@@ -2324,7 +2318,7 @@ typedef enum eGPencil_Placement_Flags {
   GP_PROJECT_VIEWSPACE = (1 << 0),
 
   /* Viewport space, but relative to render canvas (Sequencer Preview Only) */
-  GP_PROJECT_CANVAS = (1 << 1),
+  /* GP_PROJECT_CANVAS = (1 << 1), */ /* UNUSED */
 
   /* Project into the screen's Z values */
   GP_PROJECT_DEPTH_VIEW = (1 << 2),
@@ -2430,8 +2424,8 @@ enum {
 /* SceneEEVEE->shadow_method */
 enum {
   SHADOW_ESM = 1,
-  SHADOW_VSM = 2,
-  SHADOW_METHOD_MAX = 3,
+  /* SHADOW_VSM = 2, */        /* UNUSED */
+  /* SHADOW_METHOD_MAX = 3, */ /* UNUSED */
 };
 
 /* SceneDisplay->render_aa, SceneDisplay->viewport_aa */
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index cded709b0d6..483e5c4a952 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -583,7 +583,7 @@ enum {
 enum {
   /* Plain values (only one is valid at a time, once masked with UILST_FLT_SORT_MASK. */
   /** Just for sake of consistency. */
-  UILST_FLT_SORT_INDEX = 0,
+  /* UILST_FLT_SORT_INDEX = 0, */ /* UNUSED */
   UILST_FLT_SORT_ALPHA = 1,
 
   /* Bitflags affecting behavior of any kind of sorting. */
diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h
index 81548343da0..e2f7bab8102 100644
--- a/source/blender/makesdna/DNA_sound_types.h
+++ b/source/blender/makesdna/DNA_sound_types.h
@@ -104,12 +104,6 @@ typedef enum eSound_Type {
 } eSound_Type;
 #endif
 
-/* spacesound->flag */
-enum {
-  SND_DRAWFRAMES = 1,
-  SND_CFRA_NUM = 2,
-};
-
 /* bSound->flags */
 enum {
 #ifdef DNA_DEPRECATED_ALLOW
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 7adba2b7dbe..adf93bb71f3 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -218,7 +218,7 @@ typedef enum eSpaceButtons_Context {
 
 /* SpaceProperties.flag */
 typedef enum eSpaceButtons_Flag {
-  SB_PRV_OSA = (1 << 0),
+  /* SB_PRV_OSA = (1 << 0), */ /* UNUSED */
   SB_PIN_CONTEXT = (1 << 1),
   SB_FLAG_UNUSED_2 = (1 << 2),
   SB_FLAG_UNUSED_3 = (1 << 3),
@@ -279,10 +279,10 @@ typedef struct SpaceOutliner {
 
 /* SpaceOutliner.flag */
 typedef enum eSpaceOutliner_Flag {
-  SO_TESTBLOCKS = (1 << 0),
-  SO_NEWSELECTED = (1 << 1),
-  SO_FLAG_UNUSED_1 = (1 << 2), /* cleared */
-  SO_HIDE_KEYINGSETINFO = (1 << 3),
+  /* SO_TESTBLOCKS = (1 << 0), */         /* UNUSED */
+  /* SO_NEWSELECTED = (1 << 1), */        /* UNUSED */
+  SO_FLAG_UNUSED_1 = (1 << 2),            /* cleared */
+  /* SO_HIDE_KEYINGSETINFO = (1 << 3), */ /* UNUSED */
   SO_SKIP_SORT_ALPHA = (1 << 4),
   SO_SYNC_SELECT = (1 << 5),
 } eSpaceOutliner_Flag;
@@ -450,7 +450,7 @@ typedef enum eGraphEdit_Flag {
   SIPO_SELCUVERTSONLY = (1 << 5),
   /* draw names of F-Curves beside the respective curves */
   /* NOTE: currently not used */
-  SIPO_DRAWNAMES = (1 << 6),
+  /* SIPO_DRAWNAMES = (1 << 6), */ /* UNUSED */
   /* show sliders in channels list */
   SIPO_SLIDERS = (1 << 7),
   /* don't show the horizontal component of the cursor */
@@ -999,11 +999,13 @@ typedef struct FileDirEntryArr {
   char root[1024];
 } FileDirEntryArr;
 
+#if 0 /* UNUSED */
 /* FileDirEntry.status */
 enum {
   ASSET_STATUS_LOCAL = 1 << 0,  /* If active uuid is available locally/immediately. */
   ASSET_STATUS_LATEST = 1 << 1, /* If active uuid is latest available version. */
 };
+#endif
 
 /* FileDirEntry.flags */
 enum {
@@ -1158,12 +1160,6 @@ typedef enum eSpaceImage_Flag {
   SI_SHOW_B = (1 << 29),
 } eSpaceImage_Flag;
 
-/* SpaceImage.other_uv_filter */
-typedef enum eSpaceImage_OtherUVFilter {
-  SI_FILTER_SAME_IMAGE = 0,
-  SI_FILTER_ALL = 1,
-} eSpaceImage_OtherUVFilter;
-
 /** \} */
 
 /* -------------------------------------------------------------------- */
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 87018c8284d..8459447a688 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -48,7 +48,7 @@ typedef enum eUIFont_ID {
 
   /* free slots */
   UIFONT_CUSTOM1 = 2,
-  UIFONT_CUSTOM2 = 3,
+  /* UIFONT_CUSTOM2 = 3, */ /* UNUSED */
 } eUIFont_ID;
 
 /* default fonts to load/initialize */
@@ -446,7 +446,7 @@ typedef struct ThemeWireColor {
 /** #ThemeWireColor.flag */
 typedef enum eWireColor_Flags {
   TH_WIRECOLOR_CONSTCOLS = (1 << 0),
-  TH_WIRECOLOR_TEXTCOLS = (1 << 1),
+  /* TH_WIRECOLOR_TEXTCOLS = (1 << 1), */ /* UNUSED */
 } eWireColor_Flags;
 
 /**
@@ -1134,16 +1134,6 @@ typedef enum eDupli_ID_Flags {
 } eDupli_ID_Flags;
 
 /**
- * Max anti alias draw method
- * #UserDef.gpu_viewport_antialias
- */
-typedef enum eOpenGL_AntiAliasMethod {
-  USER_AA_NONE = 0,
-  USER_AA_FXAA = 1,
-  USER_AA_TAA8 = 2,
-} eOpenGL_AntiAliasMethod;
-
-/**
  * Text draw options
  * #UserDef.text_render
  */