Commit: 2e386d335086c2dda8467d36505e875c9519588b
Author: Antony Riakiotakis
Date: Thu Aug 14 14:04:29 2014 +0200
Branches: master
https://developer.blender.org/rB2e386d335086c2dda8467d36505e875c9519588b
Last fix wasn't complete, sorry for that..
===================================================================
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 8e808b3..6d4d789 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) &&
+ if ((!ui_block_is_menu(block) ||
ui_block_is_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_pie_menu(but->block))) {
+ else if (!ui_block_is_menu(but->block) ||
ui_block_is_menu(but->block)) {
/* pass, skip for dialogs */
}
else if (!ui_mouse_inside_region(but->active->region, event->x,
event->y)) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
