[Bf-blender-cvs] [87e7ad197dd] master: Fix T71303: RMB outside context menu ignored

[Kevin Havranek]

Commit: 87e7ad197ddf6e18bc95530e996e52ec07983fc0
Author: Kevin Havranek
Date:   Thu Jan 2 18:02:16 2020 +1100
Branches: master
https://developer.blender.org/rB87e7ad197ddf6e18bc95530e996e52ec07983fc0

Fix T71303: RMB outside context menu ignored

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

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 b34188684e6..05d5f03a363 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -9501,7 +9501,8 @@ static int ui_handle_menu_event(bContext *C,
                  * To support we would need UI_RETURN_OUT_PARENT to be handled by
                  * top-level buttons, not just menus. Note that this isn't very important
                  * since it's easy to manually close these menus by clicking on them. */
-                menu->menuretval = (level > 0) ? UI_RETURN_OUT_PARENT : UI_RETURN_OUT;
+                menu->menuretval = (level > 0 && is_parent_inside) ? UI_RETURN_OUT_PARENT :
+                                                                     UI_RETURN_OUT;
               }
             }
             retval = WM_UI_HANDLER_BREAK;