Cleanup: redundant defines

Comment or remove unused defines.

20 files changed, 23 insertions, 87 deletions

diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index 8c1dc77964a..7bb4142b237 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -95,7 +95,7 @@ struct Depsgraph;
 struct PBVH;
 
 /* number of sub-elements each mesh element has (for interpolation) */
-#define SUB_ELEMS_VERT 0
+// #define SUB_ELEMS_VERT 0 /* UNUSED */
 #define SUB_ELEMS_EDGE 2
 #define SUB_ELEMS_FACE 50
 
diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h
index 87094e77953..13cba949361 100644
--- a/source/blender/blenkernel/BKE_cloth.h
+++ b/source/blender/blenkernel/BKE_cloth.h
@@ -153,17 +153,11 @@ typedef struct ClothSpring {
 ClothSpring;
 
 // some macro enhancements for vector treatment
-#define VECADDADD(v1,v2,v3) 	{*(v1)+= *(v2) + *(v3); *(v1+1)+= *(v2+1) + *(v3+1); *(v1+2)+= *(v2+2) + *(v3+2);}
-#define VECSUBADD(v1,v2,v3) 	{*(v1)-= *(v2) + *(v3); *(v1+1)-= *(v2+1) + *(v3+1); *(v1+2)-= *(v2+2) + *(v3+2);}
-#define VECADDSUB(v1,v2,v3) 	{*(v1)+= *(v2) - *(v3); *(v1+1)+= *(v2+1) - *(v3+1); *(v1+2)+= *(v2+2) - *(v3+2);}
 #define VECSUBADDSS(v1,v2,aS,v3,bS) 	{*(v1)-= *(v2)*aS + *(v3)*bS; *(v1+1)-= *(v2+1)*aS + *(v3+1)*bS; *(v1+2)-= *(v2+2)*aS + *(v3+2)*bS;}
-#define VECADDSUBSS(v1,v2,aS,v3,bS) 	{*(v1)+= *(v2)*aS - *(v3)*bS; *(v1+1)+= *(v2+1)*aS - *(v3+1)*bS; *(v1+2)+= *(v2+2)*aS - *(v3+2)*bS;}
 #define VECADDSS(v1,v2,aS,v3,bS) 	{*(v1)= *(v2)*aS + *(v3)*bS; *(v1+1)= *(v2+1)*aS + *(v3+1)*bS; *(v1+2)= *(v2+2)*aS + *(v3+2)*bS;}
 #define VECADDS(v1,v2,v3,bS) 	{*(v1)= *(v2) + *(v3)*bS; *(v1+1)= *(v2+1) + *(v3+1)*bS; *(v1+2)= *(v2+2) + *(v3+2)*bS;}
 #define VECSUBMUL(v1,v2,aS) 	{*(v1)-= *(v2) * aS; *(v1+1)-= *(v2+1) * aS; *(v1+2)-= *(v2+2) * aS;}
 #define VECSUBS(v1,v2,v3,bS) 	{*(v1)= *(v2) - *(v3)*bS; *(v1+1)= *(v2+1) - *(v3+1)*bS; *(v1+2)= *(v2+2) - *(v3+2)*bS;}
-#define VECSUBSB(v1,v2, v3,bS) 	{*(v1)= (*(v2)- *(v3))*bS; *(v1+1)= (*(v2+1) - *(v3+1))*bS; *(v1+2)= (*(v2+2) - *(v3+2))*bS;}
-#define VECMULS(v1,aS) 	{*(v1)*= aS; *(v1+1)*= aS; *(v1+2)*= *aS;}
 #define VECADDMUL(v1,v2,aS) 	{*(v1)+= *(v2) * aS; *(v1+1)+= *(v2+1) * aS; *(v1+2)+= *(v2+2) * aS;}
 
 /* SIMULATION FLAGS: goal flags,.. */
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index c2981128ab8..0b1a45028c1 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -172,20 +172,8 @@ enum {
 
 #define G_FILE_USERPREFS         (1 << 9)
 #define G_FILE_NO_UI             (1 << 10)
-#ifdef DNA_DEPRECATED_ALLOW
-/* #define G_FILE_GAME_TO_IPO    (1 << 11) */           /* deprecated */
-#define G_FILE_GAME_MAT          (1 << 12)              /* deprecated */
-/* #define G_FILE_DISPLAY_LISTS  (1 << 13) */           /* deprecated */
-#define G_FILE_SHOW_PHYSICS      (1 << 14)              /* deprecated */
-#define G_FILE_GAME_MAT_GLSL     (1 << 15)              /* deprecated */
-/* #define G_FILE_GLSL_NO_LIGHTS     (1 << 16) */       /* deprecated */
-#define G_FILE_GLSL_NO_SHADERS   (1 << 17)              /* deprecated */
-#define G_FILE_GLSL_NO_SHADOWS   (1 << 18)              /* deprecated */
-#define G_FILE_GLSL_NO_RAMPS     (1 << 19)              /* deprecated */
-#define G_FILE_GLSL_NO_NODES     (1 << 20)              /* deprecated */
-#define G_FILE_GLSL_NO_EXTRA_TEX (1 << 21)              /* deprecated */
-#define G_FILE_IGNORE_DEPRECATION_WARNINGS  (1 << 22)   /* deprecated */
-#endif  /* DNA_DEPRECATED_ALLOW */
+
+/* Bits 11 to 22 (inclusive) are deprecated & need to be cleared */
 
 /* On read, use #FileGlobal.filename instead of the real location on-disk,
  * needed for recovering temp files so relative paths resolve */
@@ -198,7 +186,7 @@ enum {
 // #define G_FILE_MESH_COMPAT       (1 << 26)
 /* On write, restore paths after editing them (G_FILE_RELATIVE_REMAP) */
 #define G_FILE_SAVE_COPY         (1 << 27)
-#define G_FILE_GLSL_NO_ENV_LIGHTING (1 << 28)
+/* #define G_FILE_GLSL_NO_ENV_LIGHTING (1 << 28) */ /* deprecated */
 
 #define G_FILE_FLAGS_RUNTIME (G_FILE_NO_UI | G_FILE_RELATIVE_REMAP | G_FILE_SAVE_COPY)
 
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index 746733e4e0e..8e4ce9988ec 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -40,8 +40,6 @@ extern "C" {
 #define TODO_LAYER_OPERATORS /* collection mamanger and property panel operators */
 #define TODO_LAYER /* generic todo */
 
-#define ROOT_PROP "root"
-
 struct Base;
 struct Collection;
 struct Depsgraph;
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 9504eff7dec..c228e56e88d 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -426,16 +426,6 @@ void modwrap_deformVertsEM(
         struct BMEditMesh *em, struct Mesh *me,
         float (*vertexCos)[3], int numVerts);
 
-#define applyModifier_DM_wrapper(NEW_FUNC_NAME, OLD_FUNC_NAME) \
-	static Mesh *NEW_FUNC_NAME(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh) \
-	{ \
-		DerivedMesh *dm = CDDM_from_mesh_ex(mesh, CD_REFERENCE, CD_MASK_EVERYTHING); \
-		DerivedMesh *ndm = OLD_FUNC_NAME(md, ctx, dm); \
-		if (ndm != dm) dm->release(dm); \
-		DM_to_mesh(ndm, mesh, ctx->object, CD_MASK_EVERYTHING, true); \
-		return mesh; \
-	}
-
 /* wrappers for modifier callbacks that accept Mesh and select the proper implementation
  * depending on if the modifier has been ported to Mesh or is still using DerivedMesh
  */
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.h b/source/blender/blenkernel/intern/CCGSubSurf.h
index 8cdbd2a7a98..e8ed186a8a1 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf.h
+++ b/source/blender/blenkernel/intern/CCGSubSurf.h
@@ -71,8 +71,6 @@ typedef enum {
 
 /***/
 
-#define CCG_OMP_LIMIT	1000000
-
 /* TODO(sergey): This actually depends on subsurf level as well. */
 #define CCG_TASK_LIMIT 16
 
diff --git a/source/blender/draw/intern/draw_builtin_shader.c b/source/blender/draw/intern/draw_builtin_shader.c
index 8b8f4bc2e04..5606d31f73f 100644
--- a/source/blender/draw/intern/draw_builtin_shader.c
+++ b/source/blender/draw/intern/draw_builtin_shader.c
@@ -38,15 +38,6 @@
 
 extern char datatoc_common_world_clip_lib_glsl[];
 
-extern char datatoc_gpu_shader_3D_smooth_color_frag_glsl[];
-extern char datatoc_gpu_shader_3D_smooth_color_vert_glsl[];
-extern char datatoc_gpu_shader_3D_vert_glsl[];
-extern char datatoc_gpu_shader_depth_only_frag_glsl[];
-extern char datatoc_gpu_shader_flat_color_frag_glsl[];
-extern char datatoc_gpu_shader_instance_camera_vert_glsl[];
-extern char datatoc_gpu_shader_instance_variying_size_variying_color_vert_glsl[];
-extern char datatoc_gpu_shader_uniform_color_frag_glsl[];
-
 /* Add shaders to this list when support is added. */
 #define GPU_SHADER_IS_SUPPORTED(shader_id) \
 	ELEM(shader_id, \
diff --git a/source/blender/draw/modes/shaders/paint_vert_frag.glsl b/source/blender/draw/modes/shaders/paint_vert_frag.glsl
index d7f604d5c2c..2e83362b90f 100644
--- a/source/blender/draw/modes/shaders/paint_vert_frag.glsl
+++ b/source/blender/draw/modes/shaders/paint_vert_frag.glsl
@@ -3,7 +3,6 @@ flat in vec4 finalColor;
 out vec4 fragColor;
 
 #define VERTEX_SELECTED (1 << 0)
-#define VERTEX_HIDE     (1 << 4)
 
 void main()
 {
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c
index 4456f13e223..6f6dbb04d28 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -1155,8 +1155,6 @@ void GPU_shader_get_builtin_shader_code(
 	*r_defines = stages->defs;
 }
 
-#define MAX_DEFINES 100
-
 void GPU_shader_free_builtin_shaders(void)
 {
 	for (int i = 0; i < GPU_NUM_BUILTIN_SHADERS; ++i) {
diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h
index 804095a0727..0328bbe6609 100644
--- a/source/blender/imbuf/intern/IMB_anim.h
+++ b/source/blender/imbuf/intern/IMB_anim.h
@@ -86,7 +86,6 @@
 #define ANIM_SEQUENCE   (1 << 0)
 #define ANIM_MOVIE      (1 << 4)
 #define ANIM_AVI        (1 << 6)
-#define ANIM_QTIME      (1 << 7)
 #define ANIM_FFMPEG     (1 << 8)
 
 #define MAXNUMSTREAMS       50
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.
diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c
index 1acec1d8b7a..8e176119eaf 100644
--- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c
+++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c
@@ -48,11 +48,6 @@
 
 #include "eigen_capi.h"
 
-#if 0
-#define MOD_LAPLACIANSMOOTH_MAX_EDGE_PERCENTAGE 1.8f
-#define MOD_LAPLACIANSMOOTH_MIN_EDGE_PERCENTAGE 0.02f
-#endif
-
 struct BLaplacianSystem {
 	float *eweights;        /* Length weights per Edge */
 	float (*fweights)[3];   /* Cotangent weights per face */
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 0036ae7834d..5367e7b0aef 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -253,7 +253,7 @@ typedef struct wmNotifier {
 #define	NC_GEOM				(16<<24)
 #define NC_NODE				(17<<24)
 #define NC_ID				(18<<24)
-#define NC_LOGIC			(19<<24)
+/* (19<<24) is free */
 #define NC_MOVIECLIP			(20<<24)
 #define NC_MASK				(21<<24)
 #define NC_GPENCIL			(22<<24)