[Bf-blender-cvs] [009c38df530] master: Fix recently added drag events closing menus
Campbell Barton
noreply at git.blender.org
Fri Jun 8 08:02:34 CEST 2018
Commit: 009c38df5303f0a32eed2962650b89ebd6ae2e46
Author: Campbell Barton
Date: Fri Jun 8 08:01:43 2018 +0200
Branches: master
https://developer.blender.org/rB009c38df5303f0a32eed2962650b89ebd6ae2e46
Fix recently added drag events closing menus
===================================================================
M source/blender/editors/interface/interface_handlers.c
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 3abaa1d88eb..6dcd7547bf5 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -3763,7 +3763,7 @@ static int ui_do_but_BUT(
button_activate_state(C, but, BUTTON_STATE_WAIT_RELEASE);
return WM_UI_HANDLER_BREAK;
}
- else if (event->type == LEFTMOUSE && but->block->handle) {
+ else if (event->type == LEFTMOUSE && event->val == KM_RELEASE && but->block->handle) {
/* regular buttons will be 'UI_SELECT', menu items 'UI_ACTIVE' */
if (!(but->flag & (UI_SELECT | UI_ACTIVE)))
data->cancel = true;
More information about the Bf-blender-cvs
mailing list