diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-10-12 13:12:10 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-10-12 13:12:10 +0300 |
| commit | a8e894951a0b54d7cffd90b347ca64cb0789fe43 (patch) | |
| tree | 553fa0fe2a2a1545672fde49ac17e05e4c2880ea /source/blender/editors/interface/interface_intern.h | |
| parent | 7a89fa4a8550a7b3020bd762ab8b69ec836e2f6b (diff) | |
| parent | b618c185cb7c5930980e459c84b8818a0fba1f1d (diff) | |
Merge branch 'master' of git.blender.org:blender into cycles_embree
Diffstat (limited to 'source/blender/editors/interface/interface_intern.h')
| -rw-r--r-- | source/blender/editors/interface/interface_intern.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 75f2efdf3aa..11691fd8365 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -404,9 +404,10 @@ struct uiBlock { short alignnr; char direction; + char theme_style; /* UI_BLOCK_THEME_STYLE_* */ char dt; /* drawtype: UI_EMBOSS, UI_EMBOSS_NONE ... etc, copied to buttons */ bool auto_open; - char _pad[7]; + char _pad[6]; double auto_open_last; const char *lockstr; |