diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-12-10 05:59:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-10 06:01:55 +0400 |
| commit | cc9372b7e0f848405e37d51587916c4ec7f636a3 (patch) | |
| tree | 514131229d0c834a05f933e1463e089b7375d8ed /source/blender/makesdna/DNA_world_types.h | |
| parent | 96f95e02233d21129860c9a163bf284039c7c89f (diff) | |
DNA Deprecation: add DNA_DEPRECATED_GCC_POISON for enum/structs.
also fully remove freestyle raycasting_algorithm
Diffstat (limited to 'source/blender/makesdna/DNA_world_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_world_types.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index 3e01e159d6c..50542797f0b 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -142,7 +142,7 @@ typedef struct World { /* mode */ #define WO_MIST 1 -#define WO_STARS 2 /* deprecated */ +//#define WO_STARS 2 /* deprecated */ /*#define WO_DOF 4*/ #define WO_ACTIVITY_CULLING 8 #define WO_ENV_LIGHT 16 @@ -151,10 +151,16 @@ typedef struct World { #define WO_INDIRECT_LIGHT 128 /* aomix */ -#define WO_AOADD 0 -#define WO_AOSUB 1 /* deprecated */ -#define WO_AOADDSUB 2 /* deprecated */ -#define WO_AOMUL 3 +enum { + WO_AOADD = 0, + WO_AOSUB = 1, /* deprecated */ + WO_AOADDSUB = 2, /* deprecated */ + WO_AOMUL = 3, +}; + +#if (DNA_DEPRECATED_GCC_POISON == 1) +#pragma GCC poison WO_AOSUB WO_AOADDSUB +#endif /* ao_samp_method - methods for sampling the AO hemi */ #define WO_AOSAMP_CONSTANT 0 |