diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-11-07 14:24:11 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-11-07 14:24:11 +0300 |
commit | 008d6987d0d2b0b2d3bc44c649b769c2d32d6f59 (patch) | |
tree | 0d765dd87b3ba0ad12f0baee21d14381fdf852a3 /source/blender/makesdna | |
parent | a8d1f308072261afb90a12cdb6c54c9a3981e087 (diff) |
move SPACE_* (enum) and SPACEICONMAX to DNA_space_types (being the more logical place than DNA_screen_types). SPACEICONMAX gets its value now through this enum, so it is not anymore easy to forget to update it correctly :)
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_screen_types.h | 26 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 24 |
2 files changed, 24 insertions, 26 deletions
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 82588b19886..7aab508c473 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -164,31 +164,5 @@ typedef struct ScrArea { #define SCREEN_HANDLER_PYTHON 2 #define SCREEN_HANDLER_VERSE 3 -/* dunno who thought this below is nice code, but be warned, the values are written in - a file, and cannot be switched or altered. enum here is out of focus (ton) */ -enum { - SPACE_EMPTY, - SPACE_VIEW3D, - SPACE_IPO, - SPACE_OOPS, - SPACE_BUTS, - SPACE_FILE, - SPACE_IMAGE, - SPACE_INFO, - SPACE_SEQ, - SPACE_TEXT, - SPACE_IMASEL, - SPACE_SOUND, - SPACE_ACTION, - SPACE_NLA, - SPACE_SCRIPT, - SPACE_TIME, - SPACE_NODE -/* SPACE_LOGIC */ -}; - -/* Adding a new space type? Change SPACEICONMAX in BSE_headerbuttons.h */ -/* -- should rather handle this with the above enum... */ - #endif diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index d5f50529ca9..f89f67529a6 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -493,6 +493,7 @@ typedef struct SpaceImaSel { #define ST_SCROLL_SELECT 0x0001 // scrollable #define ST_CLEAR_NAMESPACE 0x0010 // clear namespace after script // execution (see BPY_main.c) + /* SpaceOops->type */ #define SO_OOPS 0 #define SO_OUTLINER 1 @@ -590,4 +591,27 @@ typedef struct SpaceImaSel { /* sseq->flag */ #define SEQ_DRAWFRAMES 1 +/* space types, moved from DNA_screen_types.h */ +enum { + SPACE_EMPTY, + SPACE_VIEW3D, + SPACE_IPO, + SPACE_OOPS, + SPACE_BUTS, + SPACE_FILE, + SPACE_IMAGE, + SPACE_INFO, + SPACE_SEQ, + SPACE_TEXT, + SPACE_IMASEL, + SPACE_SOUND, + SPACE_ACTION, + SPACE_NLA, + SPACE_SCRIPT, + SPACE_TIME, + SPACE_NODE, + SPACEICONMAX = SPACE_NODE +/* SPACE_LOGIC */ +}; + #endif |