diff options
| author | Nathan Craddock <nzcraddock@gmail.com> | 2020-08-05 19:46:12 +0300 |
|---|---|---|
| committer | Nathan Craddock <nzcraddock@gmail.com> | 2020-08-05 19:46:12 +0300 |
| commit | 9118df1ecdfe08653c46925a9609d7651cc01594 (patch) | |
| tree | f748a867ce004ff0977607c194f9750b3f985fde /source/blender/editors | |
| parent | 9e644b98a6f7645e350b9c1f75ad0721258801ad (diff) | |
| parent | d84dce85f300a360036129cc8921bc21074e20f6 (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 4944e29fcec..dc119d19003 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -1382,6 +1382,9 @@ static void ui_multibut_states_apply(bContext *C, uiHandleButtonData *data, uiBl static bool ui_drag_toggle_but_is_supported(const uiBut *but) { + if (but->flag & UI_BUT_DISABLED) { + return false; + } if (ui_but_is_bool(but)) { return true; } |