From c77179a3c25b349e8686cdbfe8603e4d03ee2ed3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 28 May 2013 01:15:59 +0000 Subject: code cleanup: comment/remove unused defines --- source/blender/makesdna/DNA_image_types.h | 2 +- source/blender/makesdna/DNA_lamp_types.h | 2 +- source/blender/makesdna/DNA_material_types.h | 3 --- source/blender/makesdna/DNA_nla_types.h | 7 +++---- source/blender/makesdna/DNA_property_types.h | 2 +- source/blender/makesdna/DNA_screen_types.h | 3 +-- source/blender/makesdna/DNA_space_types.h | 5 ----- source/blender/makesdna/DNA_text_types.h | 4 ++-- source/blender/makesdna/DNA_world_types.h | 2 +- 9 files changed, 10 insertions(+), 20 deletions(-) (limited to 'source/blender/makesdna') 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) -- cgit v1.2.3