diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-14 21:00:10 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-14 21:00:10 +0300 |
commit | 81a03e17f759316bb40fa4bd416bc2d8d3131bb6 (patch) | |
tree | fad7b9ab268996ed61acf66c3cb322da726a3f13 /source/blender/editors/interface/interface_intern.h | |
parent | 9d4fd2573531ea841ed0940b3babbe76da2e6d02 (diff) | |
parent | 57b5852bc8b8188e73e2ffd7c05aaa3f409c3025 (diff) |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/editors/interface/interface_intern.h')
-rw-r--r-- | source/blender/editors/interface/interface_intern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 9d3f2088ab4..e5f6f09e2eb 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -523,7 +523,6 @@ extern uiButExtraIconType ui_but_icon_extra_get(uiBut *but); extern void ui_but_default_set(struct bContext *C, const bool all, const bool use_afterfunc); -extern void ui_but_update_ex(uiBut *but, const bool validate); extern void ui_but_update(uiBut *but); extern void ui_but_update_edited(uiBut *but); extern bool ui_but_is_float(const uiBut *but) ATTR_WARN_UNUSED_RESULT; @@ -728,6 +727,7 @@ extern void ui_but_execute_begin(struct bContext *C, struct ARegion *ar, uiBut * extern void ui_but_execute_end(struct bContext *C, struct ARegion *ar, uiBut *but, void *active_back); extern void ui_but_active_free(const struct bContext *C, uiBut *but); extern bool ui_but_is_active(struct ARegion *ar) ATTR_WARN_UNUSED_RESULT; +extern bool ui_but_is_editing(uiBut *but); extern int ui_but_menu_direction(uiBut *but); extern void ui_but_text_password_hide(char password_str[UI_MAX_DRAW_STR], uiBut *but, const bool restore); extern uiBut *ui_but_find_select_in_enum(uiBut *but, int direction); |