Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-07-10 08:58:08 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-07-10 08:58:50 +0300
commit66f1c3b882d59ea2b6600dfe9464c7c81e8c8483 (patch)
tree4a5a3c089e4acdf6f6082408a90f39767c29a778 /source/blender/makesdna/DNA_space_types.h
parent5513fdc62988ec92a0c76824b2a8d56a88c02254 (diff)
DNA: replace GCC poison with ifdef for enums
Diffstat (limited to 'source/blender/makesdna/DNA_space_types.h')
-rw-r--r--source/blender/makesdna/DNA_space_types.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 9d5b6bb42b4..ab19273f087 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -1204,10 +1204,13 @@ typedef enum eSpace_Type {
SPACE_INFO = 7,
SPACE_SEQ = 8,
SPACE_TEXT = 9,
+#ifdef DNA_DEPRECATED
SPACE_IMASEL = 10, /* deprecated */
SPACE_SOUND = 11, /* Deprecated */
+#endif
SPACE_ACTION = 12,
SPACE_NLA = 13,
+ /* TODO: fully deprecate */
SPACE_SCRIPT = 14, /* Deprecated */
SPACE_TIME = 15,
SPACE_NODE = 16,
@@ -1222,10 +1225,6 @@ typedef enum eSpace_Type {
/* use for function args */
#define SPACE_TYPE_ANY -1
-// TODO: SPACE_SCRIPT
-#if (DNA_DEPRECATED_GCC_POISON == 1)
-#pragma GCC poison SPACE_IMASEL SPACE_SOUND
-#endif
#define IMG_SIZE_FALLBACK 256