diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-07-10 08:58:08 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-10 08:58:50 +0300 |
| commit | 66f1c3b882d59ea2b6600dfe9464c7c81e8c8483 (patch) | |
| tree | 4a5a3c089e4acdf6f6082408a90f39767c29a778 /source/blender/makesdna/DNA_world_types.h | |
| parent | 5513fdc62988ec92a0c76824b2a8d56a88c02254 (diff) | |
DNA: replace GCC poison with ifdef for enums
Diffstat (limited to 'source/blender/makesdna/DNA_world_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_world_types.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index 2a9bcc20a9f..73bfa7a36fe 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -154,15 +154,13 @@ typedef struct World { /* aomix */ enum { WO_AOADD = 0, +#ifdef DNA_DEPRECATED WO_AOSUB = 1, /* deprecated */ WO_AOADDSUB = 2, /* deprecated */ +#endif 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 #define WO_AOSAMP_HALTON 1 |