[Bf-blender-cvs] [8e30db0] master: Aaaarh! aaargh!

[Antony Riakiotakis]

Commit: 8e30db0f674d7dec11eb7479abd69bb64cc7cfd3
Author: Antony Riakiotakis
Date:   Thu Aug 14 14:06:48 2014 +0200
Branches: master
https://developer.blender.org/rB8e30db0f674d7dec11eb7479abd69bb64cc7cfd3

Aaaarh! aaargh!

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

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 6d4d789..765a27a 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -7336,7 +7336,7 @@ static int ui_handle_button_event(bContext *C, const wmEvent *event, uiBut *but)
 				uiBut *but_other = ui_but_find_mouse_over(ar, event);
 				bool exit = false;
 
-				if ((!ui_block_is_menu(block) || ui_block_is_menu(but->block)) &&
+				if ((!ui_block_is_menu(block) || ui_block_is_pie_menu(but->block)) &&
 				    !ui_mouse_inside_button(ar, but, event->x, event->y))
 				{
 					exit = true;
@@ -7945,7 +7945,7 @@ 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) || ui_block_is_menu(but->block)) {
+		else if (!ui_block_is_menu(but->block) || ui_block_is_pie_menu(but->block)) {
 			/* pass, skip for dialogs */
 		}
 		else if (!ui_mouse_inside_region(but->active->region, event->x, event->y)) {