diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-13 20:56:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-13 21:00:11 +0300 |
| commit | b54b14582bbd65103b5b052168dd8353e261d2ea (patch) | |
| tree | 2fb3b8c62b18644977d15e5ca8a411a34efa02ae /source/blender/editors/interface/interface_handlers.c | |
| parent | a75ac18638f41d8b427b7519628602b6be54d995 (diff) | |
Fix T61505, T61280, bugs in button drag toggle after recent changes.
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 92dac3f0257..672458e1db2 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -1241,9 +1241,10 @@ static bool ui_drag_toggle_but_is_supported(const uiBut *but) * then just true or false for toggle buttons with more than 2 states. */ static int ui_drag_toggle_but_pushed_state(uiBut *but) { - if (but->icon) { + if (but->rnapoin.data == NULL && but->poin == NULL && but->icon) { /* Assume icon identifies a unique state, for buttons that - * work though functions callbacks. */ + * work though functions callbacks and don't have an boolean + * value that indicates the state. */ return but->icon + but->iconadd; } else if (ui_but_is_bool(but)) { |