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_sequence_types.h | |
| parent | 5513fdc62988ec92a0c76824b2a8d56a88c02254 (diff) | |
DNA: replace GCC poison with ifdef for enums
Diffstat (limited to 'source/blender/makesdna/DNA_sequence_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_sequence_types.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 7cf4d9fdff7..377da2a7d82 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -368,7 +368,9 @@ enum { SEQ_OVERLAP = (1 << 3), SEQ_FILTERY = (1 << 4), SEQ_MUTE = (1 << 5), +#ifdef DNA_DEPRECATED SEQ_MAKE_PREMUL = (1 << 6), /* deprecated, used for compatibility code only */ +#endif SEQ_REVERSE_FRAMES = (1 << 7), SEQ_IPO_FRAME_LOCKED = (1 << 8), SEQ_EFFECT_NOT_LOADED = (1 << 9), @@ -406,10 +408,6 @@ enum { SEQ_STORAGE_PROXY_CUSTOM_DIR = (1 << 2), /* store proxy in custom file */ }; -#if (DNA_DEPRECATED_GCC_POISON == 1) -#pragma GCC poison SEQ_MAKE_PREMUL -#endif - /* convenience define for all selection flags */ #define SEQ_ALLSEL (SELECT + SEQ_LEFTSEL + SEQ_RIGHTSEL) |