diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-15 11:23:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-15 11:24:53 +0300 |
| commit | cbc7ee28d7fe145564ca6c398a99e0519d97010d (patch) | |
| tree | 9d2b4fed13dab24be2b43bb55509d83df803769b /source/blender/makesdna/DNA_screen_types.h | |
| parent | 3ee606621cf53a2a4897e534e7e04d3632f419f8 (diff) | |
WM: 2.8 screen compatibility
Without these minor changes loading files from 2.8 will crash.
Manually applied edits from 26786a2b87a08
Diffstat (limited to 'source/blender/makesdna/DNA_screen_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_screen_types.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index a7718883438..a9767f506dc 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -53,10 +53,10 @@ typedef struct bScreen { ListBase edgebase; ListBase areabase; ListBase regionbase; /* screen level regions (menus), runtime only */ - + struct Scene *scene; struct Scene *newscene; /* temporary when switching */ - + short winid; /* winid from WM, starts with 1 */ short redraws_flag; /* user-setting for which editors get redrawn during anim playback (used to be time->redraws) */ @@ -384,7 +384,7 @@ enum { RGN_TYPE_UI = 4, RGN_TYPE_TOOLS = 5, RGN_TYPE_TOOL_PROPS = 6, - RGN_TYPE_PREVIEW = 7 + RGN_TYPE_PREVIEW = 7, }; /* use for function args */ #define RGN_TYPE_ANY -1 @@ -403,8 +403,12 @@ enum { #define RGN_SPLIT_PREV 32 /* region flag */ -#define RGN_FLAG_HIDDEN 1 -#define RGN_FLAG_TOO_SMALL 2 +enum { + RGN_FLAG_HIDDEN = (1 << 0), + RGN_FLAG_TOO_SMALL = (1 << 1), + /* Region data is NULL'd on read, never written. */ + RGN_FLAG_TEMP_REGIONDATA = (1 << 3), +}; /* region do_draw */ #define RGN_DRAW 1 |