Cleanup: redundant defines

Comment or remove unused defines.

8 files changed, 18 insertions, 32 deletions

diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h
index 3437c1a4a4d..9c6b68b865a 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -236,7 +236,8 @@ typedef struct Curve {
 
 	/** Keep a short because of BKE_object_obdata_texspace_get(). */
 	short texflag;
-	short drawflag, twist_mode;
+	char _pad0[2];
+	short twist_mode;
 	float twist_smooth, smallcaps_scale;
 
 	int pathlen;
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index 3bdd0e0b31b..566afaa1548 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -150,8 +150,8 @@ typedef struct Lamp {
 /* area shape */
 #define LA_AREA_SQUARE	0
 #define LA_AREA_RECT	1
-#define LA_AREA_CUBE	2
-#define LA_AREA_BOX		3
+/* #define LA_AREA_CUBE 2 */ /* UNUSED */
+/* #define LA_AREA_BOX  3 */ /* UNUSED */
 #define LA_AREA_DISK	4
 #define LA_AREA_ELLIPSE	5
 
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 144f1dfd6d1..bd81d170e8e 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -210,7 +210,7 @@ typedef struct Material {
 
 /* flag */
 		/* for render */
-#define MA_IS_USED      (1 << 0)
+/* #define MA_IS_USED      (1 << 0) */ /* UNUSED */
 		/* for dopesheet */
 #define MA_DS_EXPAND    (1 << 1)
 		/* for dopesheet (texture stack expander)
@@ -241,24 +241,24 @@ typedef struct Material {
 
 /* texco */
 #define TEXCO_ORCO      (1 << 0)
-#define TEXCO_REFL      (1 << 1)
-#define TEXCO_NORM      (1 << 2)
+/* #define TEXCO_REFL      (1 << 1) */ /* deprecated */
+/* #define TEXCO_NORM      (1 << 2) */ /* deprecated */
 #define TEXCO_GLOB      (1 << 3)
 #define TEXCO_UV        (1 << 4)
 #define TEXCO_OBJECT    (1 << 5)
-#define TEXCO_LAVECTOR  (1 << 6)
-#define TEXCO_VIEW      (1 << 7)
-#define TEXCO_STICKY_   (1 << 8)  // DEPRECATED
-#define TEXCO_OSA       (1 << 9)
+/* #define TEXCO_LAVECTOR  (1 << 6) */ /* deprecated */
+/* #define TEXCO_VIEW      (1 << 7) */ /* deprecated */
+/* #define TEXCO_STICKY   (1 << 8) */ /* deprecated */
+/* #define TEXCO_OSA       (1 << 9) */ /* deprecated */
 #define TEXCO_WINDOW    (1 << 10)
-#define NEED_UV         (1 << 11)
-#define TEXCO_TANGENT   (1 << 12)
+/* #define NEED_UV         (1 << 11) */ /* deprecated */
+/* #define TEXCO_TANGENT   (1 << 12) */ /* deprecated */
 	/* still stored in vertex->accum, 1 D */
 #define TEXCO_STRAND    (1 << 13)
 /** strand is used for normal materials, particle for halo materials */
 #define TEXCO_PARTICLE  (1 << 13)
-#define TEXCO_STRESS    (1 << 14)
-#define TEXCO_SPEED     (1 << 15)
+/* #define TEXCO_STRESS    (1 << 14) */ /* deprecated */
+/* #define TEXCO_SPEED     (1 << 15) */ /* deprecated */
 
 /* mapto */
 #define MAP_COL			(1 << 0)
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 4bb639661e9..db9fa37ebd3 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -632,12 +632,6 @@ enum {
 #  define OB_FLAG_DEPRECATED_12        (1 << 12)  /* cleared */
 #endif
 
-/* controller state */
-#define OB_MAX_STATES       30
-
-/* collision masks */
-#define OB_MAX_COL_MASKS    16
-
 /* ob->restrictflag */
 enum {
 	OB_RESTRICT_VIEW    = 1 << 0,
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 8509b24ee14..427dcee4651 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -532,11 +532,6 @@ typedef enum eParticleShapeFlag {
 #define PART_DRAW_COL_VEL		2
 #define PART_DRAW_COL_ACC		3
 
-
-/* part->simplify_flag */
-#define PART_SIMPLIFY_ENABLE	1
-#define PART_SIMPLIFY_VIEWPORT	2
-
 /* part->time_flag */
 #define PART_TIME_AUTOSF	1 /* Automatic subframes */
 
@@ -615,8 +610,8 @@ typedef enum eParticleShapeFlag {
 #define	PSYS_KEYED_TIMING	8
 //#define PSYS_ENABLED		16	/* deprecated */
 #define PSYS_HAIR_UPDATED	32  /* signal for updating hair particle mode */
-#define PSYS_DRAWING		64
-#define PSYS_USE_IMAT		128
+/* #define PSYS_DRAWING		64 */ /* deprecated */
+/* #define PSYS_USE_IMAT		128 */ /* deprecated */
 #define PSYS_DELETE			256	/* remove particlesystem as soon as possible */
 #define PSYS_HAIR_DONE		512
 #define PSYS_KEYED			1024
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index b9912a90bba..165ae37b3d5 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -252,7 +252,7 @@ typedef struct SceneRenderLayer {
 	/* flags between (1 << 8) and (1 << 15) are set to 1 already, for future options */
 
 #define SCE_LAY_ALL_Z       (1 << 15)
-#define SCE_LAY_XOR         (1 << 16)
+/* #define SCE_LAY_XOR         (1 << 16) */  /* UNUSED */
 #define SCE_LAY_DISABLE     (1 << 17)
 #define SCE_LAY_ZMASK       (1 << 18)
 #define SCE_LAY_NEG_ZMASK   (1 << 19)
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index 9f598d1ba9a..682cd5b6d85 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -477,7 +477,6 @@ enum {
 	AREA_FLAG_ACTIONZONES_UPDATE = (1 << 8),
 };
 
-#define EDGEWIDTH	1
 #define AREAGRID	4
 #define AREAMINX	32
 #define HEADERY		26
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 999e160e03a..f86b650ddeb 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -785,7 +785,6 @@ enum eFileSortType {
 
 #define FILE_LOADLIB        1
 #define FILE_MAIN           2
-#define FILE_LOADFONT       3
 
 /* filesel op property -> action */
 typedef enum eFileSel_Action {
@@ -846,8 +845,6 @@ typedef enum eDirEntry_SelectFlag {
 	FILE_SEL_EDITING        = (1 << 4),
 } eDirEntry_SelectFlag;
 
-#define FILE_LIST_MAX_RECURSION 4
-
 /* ***** Related to file browser, but never saved in DNA, only here to help with RNA. ***** */
 
 /* About Unique identifier.