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_image_types.h | |
| parent | 5513fdc62988ec92a0c76824b2a8d56a88c02254 (diff) | |
DNA: replace GCC poison with ifdef for enums
Diffstat (limited to 'source/blender/makesdna/DNA_image_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index 0e2a41a0aeb..6088dccd4e9 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -157,7 +157,9 @@ typedef struct Image { enum { IMA_FIELDS = (1 << 0), IMA_STD_FIELD = (1 << 1), +#ifdef DNA_DEPRECATED IMA_DO_PREMUL = (1 << 2), /* deprecated, should not be used */ +#endif IMA_REFLECT = (1 << 4), IMA_NOCOLLECT = (1 << 5), //IMA_DONE_TAG = (1 << 6), // UNUSED @@ -173,10 +175,6 @@ enum { IMA_IS_MULTIVIEW = (1 << 16), /* similar to stereo, but a more general case */ }; -#if (DNA_DEPRECATED_GCC_POISON == 1) -#pragma GCC poison IMA_DO_PREMUL -#endif - /* Image.tpageflag */ #define IMA_TILES 1 #define IMA_TWINANIM 2 |