diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-01-19 09:31:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-19 09:37:01 +0300 |
commit | 4444ea42f29c9b006fd20c9fb6de5787ad98f30f (patch) | |
tree | eae8908bfeae8ef77ef8a4cedef020adbf44b06d /source/blender/makesdna | |
parent | c850320b35863edc35f0b0acd1c75ed48bb71542 (diff) | |
parent | ebf01d44ee0e034da169efc0aca81f99966ebde6 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_screen_types.h | 8 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_windowmanager_types.h | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index e3e5aaf8ca4..dd716014f66 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -290,11 +290,11 @@ typedef struct ARegion { /* area->flag */ enum { HEADER_NO_PULLDOWN = (1 << 0), - AREA_FLAG_DRAWJOINTO = (1 << 1), - AREA_FLAG_DRAWJOINFROM = (1 << 2), +// AREA_FLAG_DEPRECATED_1 = (1 << 1), +// AREA_FLAG_DEPRECATED_2 = (1 << 2), AREA_TEMP_INFO = (1 << 3), - AREA_FLAG_DRAWSPLIT_H = (1 << 4), - AREA_FLAG_DRAWSPLIT_V = (1 << 5), +// AREA_FLAG_DEPRECATED_4 = (1 << 4), +// AREA_FLAG_DEPRECATED_5 = (1 << 5), /* used to check if we should switch back to prevspace (of a different type) */ AREA_FLAG_TEMP_TYPE = (1 << 6), /* for temporary fullscreens (file browser, image editor render) that are opened above user set fullscreens */ diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index fd2a422b4c8..f794c5cbaff 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -227,6 +227,9 @@ typedef struct wmWindow { ListBase gesture; /* gesture stuff */ struct Stereo3dFormat *stereo3d_format; /* properties for stereoscopic displays */ + + /* custom drawing callbacks */ + ListBase drawcalls; } wmWindow; #ifdef ime_data |