blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 746 Projects 19 Wiki Activity

Last fix wasn't complete, sorry for that..

This commit is contained in:
Antonis Ryakiotakis 2014-08-14 14:04:29 +02:00
parent 9bf603a307
commit 2e386d3350
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/interface/interface_handlers.c
View File

@ -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)) {