diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-09 19:58:14 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-09 19:58:14 +0300 |
commit | 45a5ddb57b2a94fde25d9ffab6dfd1bdd312152c (patch) | |
tree | e89c3263245e8d2f90b6ff897d67f6daf4b3485d /source/blender/editors/include | |
parent | 419a813938f7dc39a96145aefae680413c93dfe8 (diff) | |
parent | 2e14b7fb9770ba5d7ca75f8125c73b81be8f632c (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/UI_interface.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index dee3104e6f4..42b78fa4800 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -943,7 +943,6 @@ uiBlock *uiLayoutGetBlock(uiLayout *layout); void uiLayoutSetFunc(uiLayout *layout, uiMenuHandleFunc handlefunc, void *argv); void uiLayoutSetContextPointer(uiLayout *layout, const char *name, struct PointerRNA *ptr); void uiLayoutContextCopy(uiLayout *layout, struct bContextStore *context); -const char *uiLayoutIntrospect(uiLayout *layout); // XXX - testing struct MenuType *UI_but_menutype_get(uiBut *but); struct PanelType *UI_but_paneltype_get(uiBut *but); void UI_menutype_draw(struct bContext *C, struct MenuType *mt, struct uiLayout *layout); |