[Bf-blender-cvs] [8d801c3] master: Correct menu items active behavior applying to dialogs

Campbell Barton noreply at git.blender.org
Wed Aug 13 10:21:38 CEST 2014


Commit: 8d801c3afd39d66d249c8b7e45249339ad297fcf
Author: Campbell Barton
Date:   Wed Aug 13 18:19:56 2014 +1000
Branches: master
https://developer.blender.org/rB8d801c3afd39d66d249c8b7e45249339ad297fcf

Correct menu items active behavior applying to dialogs

===================================================================

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 7cc2145..30ce7c6 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -7941,6 +7941,9 @@ static int ui_handle_menu_button(bContext *C, const wmEvent *event, uiPopupBlock
 		if (event->val == KM_RELEASE) {
 			/* pass, needed so we can exit active menu-items when click-dragging out of them */
 		}
+		else if (!ui_block_is_menu(but->block)) {
+			/* pass, skip for dialogs */
+		}
 		else if (!ui_mouse_inside_region(but->active->region, event->x, event->y)) {
 			/* pass, needed to click-exit outside of non-flaoting menus */
 		}




More information about the Bf-blender-cvs mailing list