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_modifier_types.h | |
| parent | 5513fdc62988ec92a0c76824b2a8d56a88c02254 (diff) | |
DNA: replace GCC poison with ifdef for enums
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 322df66c7fc..4db21b24a5a 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -875,15 +875,13 @@ enum { MOD_SOLIDIFY_EVEN = (1 << 1), MOD_SOLIDIFY_NORMAL_CALC = (1 << 2), MOD_SOLIDIFY_VGROUP_INV = (1 << 3), +#ifdef DNA_DEPRECATED MOD_SOLIDIFY_RIM_MATERIAL = (1 << 4), /* deprecated, used in do_versions */ +#endif MOD_SOLIDIFY_FLIP = (1 << 5), MOD_SOLIDIFY_NOSHELL = (1 << 6), }; -#if (DNA_DEPRECATED_GCC_POISON == 1) -#pragma GCC poison MOD_SOLIDIFY_RIM_MATERIAL -#endif - typedef struct ScrewModifierData { ModifierData modifier; @@ -1252,12 +1250,10 @@ typedef struct TriangulateModifierData { int pad; } TriangulateModifierData; +#ifdef DNA_DEPRECATED enum { MOD_TRIANGULATE_BEAUTY = (1 << 0), /* deprecated */ }; - -#if (DNA_DEPRECATED_GCC_POISON == 1) -#pragma GCC poison MOD_TRIANGULATE_BEAUTY #endif /* Triangulate methods - NGons */ |