diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-30 11:56:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-30 11:56:12 +0300 |
| commit | b89307acfd71955000662232b5964edcdfef5ccf (patch) | |
| tree | 504c24627c2ebeb680439092b3205e859aac2cdf /source/blender/editors/include | |
| parent | ea6fef938500f9405e7d6ff39297164b95d2811a (diff) | |
| parent | a42fd3de5d82deff4b7d9b1f14a58fd95d9d20ff (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index b00717665a9..7540e6ed602 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -402,6 +402,11 @@ typedef void (*uiMenuHandleFunc)(struct bContext *C, void *arg, int event); */ typedef bool (*uiMenuStepFunc)(struct bContext *C, int direction, void *arg1); + +/* interface_query.c */ +bool UI_block_is_empty(const uiBlock *block); + + /* interface_region_menu_popup.c */ /* Popup Menus * @@ -535,8 +540,6 @@ void UI_block_flag_enable(uiBlock *block, int flag); void UI_block_flag_disable(uiBlock *block, int flag); void UI_block_translate(uiBlock *block, int x, int y); -bool UI_block_is_empty(const uiBlock *block); - int UI_but_return_value_get(uiBut *but); void UI_but_drag_set_id(uiBut *but, struct ID *id); |