diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-02 10:25:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-02 10:25:47 +0300 |
| commit | 08141260ffa619fef1871ccd446b8a59a7b111ca (patch) | |
| tree | 7b226f6bf1fc81cc50339278d390b9539efc4495 /source/blender/editors/include | |
| parent | d2e39edae8d5c6c2062b0a03f63b33e007c4d5b2 (diff) | |
| parent | e32c1bd5d03148b123c8d2664b6164fe5cbd5c12 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index de6d9d78974..efa5328fc71 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -873,6 +873,10 @@ void uiLayoutSetContextPointer(uiLayout *layout, const char *name, struct Pointe void uiLayoutContextCopy(uiLayout *layout, struct bContextStore *context); const char *uiLayoutIntrospect(uiLayout *layout); // XXX - testing struct MenuType *UI_but_menutype_get(uiBut *but); +void UI_menutype_draw(struct bContext *C, struct MenuType *mt, struct uiLayout *layout); + +/* Only for convenience. */ +void uiLayoutSetContextFromBut(uiLayout *layout, uiBut *but); void uiLayoutSetOperatorContext(uiLayout *layout, int opcontext); void uiLayoutSetActive(uiLayout *layout, bool active); |