diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-08-14 16:04:29 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-08-14 16:04:29 +0400 |
| commit | 2e386d335086c2dda8467d36505e875c9519588b (patch) | |
| tree | c5d567bcda00fe936930e0f50d0f14e29819163c /source/blender/editors/interface/interface_handlers.c | |
| parent | 9bf603a30710fba42ace668dc0b32ac273059929 (diff) | |
Last fix wasn't complete, sorry for that..
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 8e808b3e97b..6d4d789cd73 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)) { |