[Bf-blender-cvs] [e748662] pie-menus: Fix minor issue, pie menu is set as cancelled only for hold/release style menus.
Antony Riakiotakis
noreply at git.blender.org
Tue Jun 24 22:33:07 CEST 2014
Commit: e748662785a722d7a4d3d5d6cc8f649b33334f13
Author: Antony Riakiotakis
Date: Tue Jun 24 23:32:59 2014 +0300
https://developer.blender.org/rBe748662785a722d7a4d3d5d6cc8f649b33334f13
Fix minor issue, pie menu is set as cancelled only for hold/release
style menus.
===================================================================
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 21c5f81..d590007 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -8310,7 +8310,7 @@ static int ui_handle_menu_return_submenu(bContext *C, const wmEvent *event, uiPo
if (menu->menuretval) {
/* pie menus should not close but wait for release instead */
- if (block->flag & UI_BLOCK_RADIAL) {
+ if ((block->flag & UI_BLOCK_RADIAL) && !(block->pie_data.flags & UI_PIE_CLICK_STYLE)) {
menu->menuretval = 0;
block->pie_data.flags |= UI_PIE_CANCELLED;
}
More information about the Bf-blender-cvs
mailing list