[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57069] trunk/blender/source: code cleanup : comment/remove unused defines
Campbell Barton
ideasman42 at gmail.com
Tue May 28 03:16:02 CEST 2013
Revision: 57069
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57069
Author: campbellbarton
Date: 2013-05-28 01:15:59 +0000 (Tue, 28 May 2013)
Log Message:
-----------
code cleanup: comment/remove unused defines
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_displist.h
trunk/blender/source/blender/blenkernel/BKE_global.h
trunk/blender/source/blender/blenkernel/BKE_sequencer.h
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/makesdna/DNA_image_types.h
trunk/blender/source/blender/makesdna/DNA_lamp_types.h
trunk/blender/source/blender/makesdna/DNA_material_types.h
trunk/blender/source/blender/makesdna/DNA_nla_types.h
trunk/blender/source/blender/makesdna/DNA_property_types.h
trunk/blender/source/blender/makesdna/DNA_screen_types.h
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/makesdna/DNA_text_types.h
trunk/blender/source/blender/makesdna/DNA_world_types.h
trunk/blender/source/blender/render/intern/include/render_types.h
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/intern/wm_playanim.c
trunk/blender/source/blender/windowmanager/wm_subwindow.h
trunk/blender/source/gameengine/Ketsji/BL_Shader.h
trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
Modified: trunk/blender/source/blender/blenkernel/BKE_displist.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_displist.h 2013-05-28 00:35:29 UTC (rev 57068)
+++ trunk/blender/source/blender/blenkernel/BKE_displist.h 2013-05-28 01:15:59 UTC (rev 57069)
@@ -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 */
Modified: trunk/blender/source/blender/blenkernel/BKE_global.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_global.h 2013-05-28 00:35:29 UTC (rev 57068)
+++ trunk/blender/source/blender/blenkernel/BKE_global.h 2013-05-28 01:15:59 UTC (rev 57069)
@@ -173,11 +173,6 @@
#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__)
Modified: trunk/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2013-05-28 00:35:29 UTC (rev 57068)
+++ trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2013-05-28 01:15:59 UTC (rev 57069)
@@ -46,10 +46,6 @@
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
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c 2013-05-28 00:35:29 UTC (rev 57068)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c 2013-05-28 01:15:59 UTC (rev 57069)
@@ -146,8 +146,8 @@
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;
Modified: trunk/blender/source/blender/makesdna/DNA_image_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_image_types.h 2013-05-28 00:35:29 UTC (rev 57068)
+++ trunk/blender/source/blender/makesdna/DNA_image_types.h 2013-05-28 01:15:59 UTC (rev 57069)
@@ -127,7 +127,7 @@
#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
Modified: trunk/blender/source/blender/makesdna/DNA_lamp_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_lamp_types.h 2013-05-28 00:35:29 UTC (rev 57068)
+++ trunk/blender/source/blender/makesdna/DNA_lamp_types.h 2013-05-28 01:15:59 UTC (rev 57069)
@@ -197,7 +197,7 @@
/* 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
Modified: trunk/blender/source/blender/makesdna/DNA_material_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_material_types.h 2013-05-28 00:35:29 UTC (rev 57068)
+++ trunk/blender/source/blender/makesdna/DNA_material_types.h 2013-05-28 01:15:59 UTC (rev 57069)
@@ -425,9 +425,6 @@
#define MA_HAIR 10
#define MA_ATMOS 11
-/* pr_back */
-#define MA_DARK 1
-
/* sss_flag */
#define MA_DIFF_SSS 1
Modified: trunk/blender/source/blender/makesdna/DNA_nla_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_nla_types.h 2013-05-28 00:35:29 UTC (rev 57068)
+++ trunk/blender/source/blender/makesdna/DNA_nla_types.h 2013-05-28 01:15:59 UTC (rev 57069)
@@ -53,10 +53,9 @@
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;
Modified: trunk/blender/source/blender/makesdna/DNA_property_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_property_types.h 2013-05-28 00:35:29 UTC (rev 57068)
+++ trunk/blender/source/blender/makesdna/DNA_property_types.h 2013-05-28 01:15:59 UTC (rev 57069)
@@ -54,7 +54,7 @@
#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 */
Modified: trunk/blender/source/blender/makesdna/DNA_screen_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_screen_types.h 2013-05-28 00:35:29 UTC (rev 57068)
+++ trunk/blender/source/blender/makesdna/DNA_screen_types.h 2013-05-28 01:15:59 UTC (rev 57069)
@@ -195,7 +195,7 @@
/* 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 @@
/* screen->full */
#define SCREENNORMAL 0
#define SCREENFULL 1
-#define SCREENFULLTEMP 2
/* Panel->snap - for snapping to screen edges */
Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h 2013-05-28 00:35:29 UTC (rev 57068)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h 2013-05-28 01:15:59 UTC (rev 57069)
@@ -1131,11 +1131,6 @@
/* **************** 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 {
Modified: trunk/blender/source/blender/makesdna/DNA_text_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_text_types.h 2013-05-28 00:35:29 UTC (rev 57068)
+++ trunk/blender/source/blender/makesdna/DNA_text_types.h 2013-05-28 01:15:59 UTC (rev 57069)
@@ -74,8 +74,8 @@
#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__ */
Modified: trunk/blender/source/blender/makesdna/DNA_world_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_world_types.h 2013-05-28 00:35:29 UTC (rev 57068)
+++ trunk/blender/source/blender/makesdna/DNA_world_types.h 2013-05-28 01:15:59 UTC (rev 57069)
@@ -186,7 +186,7 @@
#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)
Modified: trunk/blender/source/blender/render/intern/include/render_types.h
===================================================================
--- trunk/blender/source/blender/render/intern/include/render_types.h 2013-05-28 00:35:29 UTC (rev 57068)
+++ trunk/blender/source/blender/render/intern/include/render_types.h 2013-05-28 01:15:59 UTC (rev 57069)
@@ -84,7 +84,7 @@
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
Modified: trunk/blender/source/blender/windowmanager/WM_api.h
===================================================================
--- trunk/blender/source/blender/windowmanager/WM_api.h 2013-05-28 00:35:29 UTC (rev 57068)
+++ trunk/blender/source/blender/windowmanager/WM_api.h 2013-05-28 01:15:59 UTC (rev 57069)
@@ -99,10 +99,10 @@
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);
Modified: trunk/blender/source/blender/windowmanager/intern/wm_playanim.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_playanim.c 2013-05-28 00:35:29 UTC (rev 57068)
+++ trunk/blender/source/blender/windowmanager/intern/wm_playanim.c 2013-05-28 01:15:59 UTC (rev 57069)
@@ -788,24 +788,19 @@
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;
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list