[Bf-blender-cvs] [6fa47f656ef] master: Fix T67882: buttons are interrupt drag actions
Campbell Barton
noreply at git.blender.org
Tue Jul 30 09:43:00 CEST 2019
Commit: 6fa47f656ef57b5ac4e14614a9225090304a329d
Author: Campbell Barton
Date: Tue Jul 30 17:38:18 2019 +1000
Branches: master
https://developer.blender.org/rB6fa47f656ef57b5ac4e14614a9225090304a329d
Fix T67882: buttons are interrupt drag actions
===================================================================
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 a7fc0cfec25..d4e8b7548bc 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -10124,7 +10124,7 @@ static int ui_handler_region_menu(bContext *C, const wmEvent *event, void *UNUSE
ui_region_winrct_get_no_margin(ar_temp, &winrct);
- if (BLI_rcti_isect_pt_v(&winrct, &event->x)) {
+ if (BLI_rcti_isect_pt_v(&winrct, &event->x) || ui_region_find_active_but(ar_temp)) {
BLI_assert(ar_temp->type->regionid == RGN_TYPE_TEMPORARY);
is_inside_menu = true;
More information about the Bf-blender-cvs
mailing list