diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2014-08-14 16:06:48 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2014-08-14 16:06:48 +0400 |
commit | 8e30db0f674d7dec11eb7479abd69bb64cc7cfd3 (patch) | |
tree | e8aa5801889270dd7084d4399c1f2c03dc50d28d /source/blender/editors | |
parent | 2e386d335086c2dda8467d36505e875c9519588b (diff) |
Aaaarh! aaargh!
Diffstat (limited to 'source/blender/editors')
-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 6d4d789cd73..765a27acf40 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)) { |