code cleanup: comment/remove unused defines

19 files changed, 20 insertions, 49 deletions

diff --git a/source/blender/blenkernel/BKE_displist.h b/source/blender/blenkernel/BKE_displist.h
index dd119ae4e5d..1cf77c68345 100644
--- a/source/blender/blenkernel/BKE_displist.h
+++ b/source/blender/blenkernel/BKE_displist.h
@@ -41,7 +41,7 @@
 #define DL_SURF                 2
 #define DL_INDEX3               4
 #define DL_INDEX4               5
-#define DL_VERTCOL              6
+// #define DL_VERTCOL              6  // UNUSED
 #define DL_VERTS                7
 
 /* dl->flag */
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index 5d8b6983aad..53964f4689f 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -173,11 +173,6 @@ enum {
 
 #define G_FILE_FLAGS_RUNTIME (G_FILE_NO_UI | G_FILE_RELATIVE_REMAP | G_FILE_MESH_COMPAT | G_FILE_SAVE_COPY)
 
-/* G.windowstate */
-#define G_WINDOWSTATE_USERDEF       0
-#define G_WINDOWSTATE_BORDER        1
-#define G_WINDOWSTATE_FULLSCREEN    2
-
 /* ENDIAN_ORDER: indicates what endianness the platform where the file was
  * written had. */
 #if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h
index a161a088589..9fc0812fff7 100644
--- a/source/blender/blenkernel/BKE_sequencer.h
+++ b/source/blender/blenkernel/BKE_sequencer.h
@@ -46,10 +46,6 @@ struct bSound;
 
 struct SeqIndexBuildContext;
 
-#define BUILD_SEQAR_COUNT_NOTHING  0
-#define BUILD_SEQAR_COUNT_CURRENT  1
-#define BUILD_SEQAR_COUNT_CHILDREN 2
-
 #define EARLY_NO_INPUT      -1
 #define EARLY_DO_EFFECT     0
 #define EARLY_USE_INPUT_1   1
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index b3c94beba93..197f65988e6 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -146,8 +146,8 @@ void initglobals(void)
 	else
 		BLI_snprintf(versionstr, sizeof(versionstr), "v%d.%02d", BLENDER_VERSION / 100, BLENDER_VERSION % 100);
 
-#ifdef _WIN32   // FULLSCREEN
-	G.windowstate = G_WINDOWSTATE_USERDEF;
+#ifdef _WIN32
+	G.windowstate = 0;
 #endif
 
 	G.charstart = 0x0000;
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index 54ec07c1855..456196771a6 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -127,7 +127,7 @@ typedef struct Image {
 #define IMA_DO_PREMUL		4    /* deprecated, should not be used */
 #define IMA_REFLECT			16
 #define IMA_NOCOLLECT   	32
-#define IMA_DONE_TAG		64
+// #define IMA_DONE_TAG		64  // UNUSED
 #define IMA_OLD_PREMUL		128
 /*#define IMA_CM_PREDIVIDE	256*/  /* deprecated, should not be used */
 #define IMA_USED_FOR_RENDER	512
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index f36e65085c9..a1b3d4265d3 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -197,7 +197,7 @@ typedef struct Lamp {
 
 
 /* ray_samp_type */
-#define LA_SAMP_ROUND	1
+// #define LA_SAMP_ROUND	1  // UNUSED
 #define LA_SAMP_UMBRA	2
 #define LA_SAMP_DITHER	4
 #define LA_SAMP_JITTER	8
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index e23b85b5a4e..a6478f2ae69 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -425,9 +425,6 @@ typedef struct Material {
 #define MA_HAIR			10
 #define MA_ATMOS		11
 
-/* pr_back */
-#define MA_DARK			1
-
 /* sss_flag */
 #define MA_DIFF_SSS		1
 
diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h
index 5837f891ae0..16af3bb1be4 100644
--- a/source/blender/makesdna/DNA_nla_types.h
+++ b/source/blender/makesdna/DNA_nla_types.h
@@ -53,10 +53,9 @@ typedef struct bActionModifier {
 	struct Object *ob;
 } bActionModifier;
 
-/* NLA-Modifier Types */
-#define ACTSTRIP_MOD_DEFORM		0
-#define ACTSTRIP_MOD_NOISE		1
-#define ACTSTRIP_MOD_OOMPH		2
+/* NLA-Modifier Types (UNUSED) */
+// #define ACTSTRIP_MOD_DEFORM		0
+// #define ACTSTRIP_MOD_NOISE		1
 
 typedef struct bActionStrip {
 	struct bActionStrip *next, *prev;
diff --git a/source/blender/makesdna/DNA_property_types.h b/source/blender/makesdna/DNA_property_types.h
index c8275a41404..77cd7c3e102 100644
--- a/source/blender/makesdna/DNA_property_types.h
+++ b/source/blender/makesdna/DNA_property_types.h
@@ -54,7 +54,7 @@ typedef struct bProperty {
 #define GPROP_INT		1
 #define GPROP_FLOAT		2
 #define GPROP_STRING	3
-#define GPROP_VECTOR	4
+// #define GPROP_VECTOR	4  // UNUSED
 #define GPROP_TIME		5
 
 /* property->flag */
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index af4904864d9..166bd76500a 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -195,7 +195,7 @@ typedef struct ARegion {
 /* swap */
 #define WIN_BACK_OK		1
 #define WIN_FRONT_OK	2
-#define WIN_EQUAL		3
+// #define WIN_EQUAL		3  // UNUSED
 
 /* area->flag */
 #define HEADER_NO_PULLDOWN		1
@@ -217,7 +217,6 @@ typedef struct ARegion {
 /* screen->full */
 #define SCREENNORMAL	0
 #define SCREENFULL		1
-#define SCREENFULLTEMP	2
 
 
 /* Panel->snap - for snapping to screen edges */
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 6d7926b1e84..2d87cb1d890 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -1131,11 +1131,6 @@ typedef enum eSpaceClip_GPencil_Source {
 
 /* **************** SPACE DEFINES ********************* */
 
-/* headerbuttons: 450-499 */
-#define B_IMASELHOME        451
-#define B_IMASELREMOVEBIP   452
-
-
 /* space types, moved from DNA_screen_types.h */
 /* Do NOT change order, append on end. types are hardcoded needed */
 typedef enum eSpace_Type {
diff --git a/source/blender/makesdna/DNA_text_types.h b/source/blender/makesdna/DNA_text_types.h
index 8b18ecd7253..8d1bba6ca4f 100644
--- a/source/blender/makesdna/DNA_text_types.h
+++ b/source/blender/makesdna/DNA_text_types.h
@@ -74,8 +74,8 @@ typedef struct Text {
 #define TXT_ISMEM               0x0004
 #define TXT_ISEXT               0x0008
 #define TXT_ISSCRIPT            0x0010 /* used by space handler scriptlinks */
-#define TXT_READONLY            0x0100
-#define TXT_FOLLOW              0x0200 /* always follow cursor (console) */
+// #define TXT_READONLY            0x0100
+// #define TXT_FOLLOW              0x0200 /* always follow cursor (console) */
 #define TXT_TABSTOSPACES        0x0400 /* use space instead of tabs */
 
 #endif  /* __DNA_TEXT_TYPES_H__ */
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index 02dc81ccd4d..a0863b18cca 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -186,7 +186,7 @@ typedef struct World {
 #define WOMAP_HORIZ		2
 #define WOMAP_ZENUP		4
 #define WOMAP_ZENDOWN	8
-#define WOMAP_MIST		16 /* Deprecated */
+// #define WOMAP_MIST		16 /* Deprecated */
 
 /* flag */
 #define WO_DS_EXPAND	(1<<0)
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 5bd0e9747d4..b7b0f18b853 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -84,7 +84,7 @@ typedef struct QMCSampler {
 	double offs[BLENDER_MAX_THREADS][2];
 } QMCSampler;
 
-#define SAMP_TYPE_JITTERED		0
+// #define SAMP_TYPE_JITTERED		0  // UNUSED
 #define SAMP_TYPE_HALTON		1
 #define SAMP_TYPE_HAMMERSLEY	2
 
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 4e485ebfd63..189c30b02e8 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -99,10 +99,10 @@ struct wmWindow	*WM_window_open	(struct bContext *C, struct rcti *rect);
 int			WM_window_pixels_x		(struct wmWindow *win);
 int			WM_window_pixels_y		(struct wmWindow *win);
 
-		/* defines for 'type' WM_window_open_temp */
+/* defines for 'type' WM_window_open_temp */
 #define WM_WINDOW_RENDER		0
 #define WM_WINDOW_USERPREFS		1
-#define WM_WINDOW_FILESEL		2
+// #define WM_WINDOW_FILESEL		2  // UNUSED
 
 void		WM_window_open_temp	(struct bContext *C, struct rcti *position, int type);
 			
diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c
index e4e529ace71..b9350ca8799 100644
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@ -788,24 +788,19 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void)
 	return 1;
 }
 
-static void playanim_window_open(const char *title, int posx, int posy, int sizex, int sizey, int start_maximized)
+static void playanim_window_open(const char *title, int posx, int posy, int sizex, int sizey)
 {
-	GHOST_TWindowState inital_state;
 	GHOST_TUns32 scr_w, scr_h;
 
 	GHOST_GetMainDisplayDimensions(g_WS.ghost_system, &scr_w, &scr_h);
 
 	posy = (scr_h - posy - sizey);
 
-	if (start_maximized == G_WINDOWSTATE_FULLSCREEN)
-		inital_state = start_maximized ? GHOST_kWindowStateFullScreen : GHOST_kWindowStateNormal;
-	else
-		inital_state = start_maximized ? GHOST_kWindowStateMaximized : GHOST_kWindowStateNormal;
-
 	g_WS.ghost_window = GHOST_CreateWindow(g_WS.ghost_system,
 	                                       title,
 	                                       posx, posy, sizex, sizey,
-	                                       inital_state,
+	                                       /* could optionally start fullscreen */
+	                                       GHOST_kWindowStateNormal,
 	                                       GHOST_kDrawingContextTypeOpenGL,
 	                                       FALSE /* no stereo */, FALSE);
 }
@@ -971,7 +966,7 @@ static char *wm_main_playanim_intern(int argc, const char **argv)
 		g_WS.ghost_system = GHOST_CreateSystem();
 		GHOST_AddEventConsumer(g_WS.ghost_system, consumer);
 
-		playanim_window_open("Blender:Anim", start_x, start_y, ibuf->x, ibuf->y, 0);
+		playanim_window_open("Blender:Anim", start_x, start_y, ibuf->x, ibuf->y);
 
 		/* unified matrix, note it affects offset for drawing */
 		glMatrixMode(GL_PROJECTION);
diff --git a/source/blender/windowmanager/wm_subwindow.h b/source/blender/windowmanager/wm_subwindow.h
index b584d0127a5..064d00b0723 100644
--- a/source/blender/windowmanager/wm_subwindow.h
+++ b/source/blender/windowmanager/wm_subwindow.h
@@ -34,8 +34,6 @@
 
 
 /* *************** internal api ************** */
-#define WM_MAXSUBWIN	256
-
 void	wm_subwindows_free(wmWindow *win);
 
 int		wm_subwindow_open(wmWindow *win, rcti *winrct);
diff --git a/source/gameengine/Ketsji/BL_Shader.h b/source/gameengine/Ketsji/BL_Shader.h
index 243445d95c5..4c671d0c9a3 100644
--- a/source/gameengine/Ketsji/BL_Shader.h
+++ b/source/gameengine/Ketsji/BL_Shader.h
@@ -16,8 +16,6 @@
 #include "MT_Tuple3.h"
 #include "MT_Tuple4.h"
 
-#define SHADER_ATTRIBMAX 1
-
 /**
  * BL_Sampler
  *  Sampler access 
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index 86c712ea017..13a79cebefb 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -52,7 +52,6 @@
 #include "KX_IPhysicsController.h" /* for suspend/resume */
 #include "DNA_object_types.h"
 #include "SCA_LogicManager.h" /* for ConvertPythonToGameObject to search object names */
-#define KX_OB_DYNAMIC 1
 
 //Forward declarations.
 struct KX_ClientObjectInfo;