Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Craddock <nzcraddock@gmail.com>2020-08-05 18:47:34 +0300
committerNathan Craddock <nzcraddock@gmail.com>2020-08-05 19:42:43 +0300
commitd84dce85f300a360036129cc8921bc21074e20f6 (patch)
tree62b5c336ae43c82695b35d9e59184b85dbd04792 /source/blender
parent531a3f6c4e8575f1b9cc5b8524c92cc7e5895cf4 (diff)
Fix T72297: disabled buttons toggling on drag
Disabled buttons would incorrectly toggle state when a drag toggle passed over them. This adds a check to prevent a drag toggle on disabled buttons. Differential Revision: https://developer.blender.org/D8476
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/interface/interface_handlers.c3
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 b94224f3604..21cadec0d5f 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;
}