diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-25 08:28:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-25 08:32:43 +0300 |
| commit | 38dafd5f44a07b4937ca53cf67cce4093d5797f7 (patch) | |
| tree | 02612f48da66659340d3fd5b7ebd514502fd8e29 /source/blender/makesdna/DNA_screen_types.h | |
| parent | 032129ef3527424de241f381376a3b94a2247965 (diff) | |
| parent | 693b41eb17557ba12e7c64c5ba589c499ff45c4d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_screen_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_screen_types.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index dd716014f66..375641d1115 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -45,6 +45,8 @@ struct PanelType; struct Scene; struct uiLayout; struct wmTimer; +struct wmTooltipState; + typedef struct bScreen { ID id; @@ -77,6 +79,8 @@ typedef struct bScreen { struct wmTimer *animtimer; /* if set, screen has timer handler added in window */ void *context; /* context callback */ + struct wmTooltipState *tool_tip; /* runtime */ + PreviewImage *preview; } bScreen; |