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.c | |
| parent | 9d4fd2573531ea841ed0940b3babbe76da2e6d02 (diff) | |
| parent | 57b5852bc8b8188e73e2ffd7c05aaa3f409c3025 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/editors/interface/interface.c')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index f783c4a6906..1e079835ec5 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -3191,7 +3191,7 @@ static void ui_but_build_drawstr_int(uiBut *but, int value) * \param validate: When set, this function may change the button value. * Otherwise treat the button value as read-only. */ -void ui_but_update_ex(uiBut *but, const bool validate) +static void ui_but_update_ex(uiBut *but, const bool validate) { /* if something changed in the button */ double value = UI_BUT_VALUE_UNSET; @@ -3199,7 +3199,7 @@ void ui_but_update_ex(uiBut *but, const bool validate) ui_but_update_select_flag(but, &value); /* only update soft range while not editing */ - if (!(but->editval || but->editstr || but->editvec)) { + if (!ui_but_is_editing(but)) { if ((but->rnaprop != NULL) || (but->poin && (but->pointype & UI_BUT_POIN_TYPES))) { |