code cleanup: comment/remove unused defines
authorCampbell Barton <ideasman42@gmail.com>
Tue, 28 May 2013 01:15:59 +0000 (01:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 28 May 2013 01:15:59 +0000 (01:15 +0000)
19 files changed:
source/blender/blenkernel/BKE_displist.h
source/blender/blenkernel/BKE_global.h
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/blender.c
source/blender/makesdna/DNA_image_types.h
source/blender/makesdna/DNA_lamp_types.h
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_nla_types.h
source/blender/makesdna/DNA_property_types.h
source/blender/makesdna/DNA_screen_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_text_types.h
source/blender/makesdna/DNA_world_types.h
source/blender/render/intern/include/render_types.h
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_playanim.c
source/blender/windowmanager/wm_subwindow.h
source/gameengine/Ketsji/BL_Shader.h
source/gameengine/Ketsji/KX_GameObject.h

index dd119ae4e5d9c6aaf4f9549c41e6df6898332ec5..1cf77c68345e637d1b89a1a1fe18fc62f65ff435 100644 (file)
@@ -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 */
index 5d8b6983aad26839d7f57270e6e7c749f199c19d..53964f4689fc816cb6e8b30a3e3311f1774c3468 100644 (file)
@@ -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__)
index a161a0885899b3361d8e1ab2d0407ae69678e906..9fc0812fff7ca27756f9b5f8eeb9194d7bd97bc2 100644 (file)
@@ -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
index b3c94beba9361c3e861d116014ad7b900de87fbd..197f65988e64c9b46d1430bff417cf7f11659ecd 100644 (file)
@@ -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;
index 54ec07c18555db4f23a49967ccdbb89bcb450abf..456196771a64383b6f36689e34333fa3cd16423b 100644 (file)
@@ -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
index f36e65085c975256551a004a07223e1b87661d49..a1b3d4265d37a45126f599a5c1bf612acebb99f0 100644 (file)
@@ -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
index e23b85b5a4e9fbe981b881db9be68675f9a47c04..a6478f2ae69b8372f2b754d4cf60fe3c10c2af34 100644 (file)
@@ -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
 
index 5837f891ae05100928010f92022507bbb2206b90..16af3bb1be45171be838b402f047580dc9582b8e 100644 (file)
@@ -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;
index c8275a41404dc58fa0e8b6f55af6ebb94347ae82..77cd7c3e10225938ae6f1d1887d5da49f17f9293 100644 (file)
@@ -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 */
index af4904864d9f1cfed3966f5b0b01bd376d1d7413..166bd76500a92cd79b35686da2b3f220dff5dcc9 100644 (file)
@@ -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 */
index 6d7926b1e842427afefaf46610ddca56a9b7d6d8..2d87cb1d8900e984b14b8b277884b819454abdc9 100644 (file)
@@ -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 {
index 8b18ecd7253651d26deeddfc879c54dc2ba3d411..8d1bba6ca4fd42fc19bf286beee0ff44d207e9e1 100644 (file)
@@ -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__ */
index 02dc81ccd4d94a557ced120b6fec7ad7a0f805a0..a0863b18cca73fbfdf3e6895beac5144c404e8d1 100644 (file)
@@ -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)
index 5bd0e9747d49dcd4720711fcdfbb8051b9fc01b2..b7b0f18b85376c695d7d89a77fab57ffeb869c44 100644 (file)
@@ -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
 
index 4e485ebfd63051c69a399b633f2e5472efbbb739..189c30b02e84bf5cdf4950b0c878ae74aec53b6b 100644 (file)
@@ -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);
                        
index e4e529ace714564d74c190e6141fb01a2cd844bf..b9350ca8799d2237e5e205d3312b17111baad084 100644 (file)
@@ -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);
index b584d0127a51b207a2d7451226ab6b206acc4ab8..064d00b0723a296585ceaf01db919e3fb91af17a 100644 (file)
@@ -34,8 +34,6 @@
 
 
 /* *************** internal api ************** */
-#define WM_MAXSUBWIN   256
-
 void   wm_subwindows_free(wmWindow *win);
 
 int            wm_subwindow_open(wmWindow *win, rcti *winrct);
index 243445d95c5f5bf78579f28030900128b3289b64..4c671d0c9a3540694890a6bca9924400351b9b37 100644 (file)
@@ -16,8 +16,6 @@
 #include "MT_Tuple3.h"
 #include "MT_Tuple4.h"
 
-#define SHADER_ATTRIBMAX 1
-
 /**
  * BL_Sampler
  *  Sampler access 
index 86c712ea01795f3344184779a3f173d7e0224a6f..13a79cebefbe6ef506660ce695e7449f1916c721 100644 (file)
@@ -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;