[Bf-blender-cvs] [8df7e10] pie-menus: minor refactoring and all pie operators return finished.

[Antony Riakiotakis]

Commit: 8df7e10f3024cc936caac00543d992b190ff4c38
Author: Antony Riakiotakis
Date:   Tue Jun 3 00:30:13 2014 +0300
https://developer.blender.org/rB8df7e10f3024cc936caac00543d992b190ff4c38

minor refactoring and all pie operators return finished.

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

M	release/scripts/startup/bl_operators/wm.py
M	source/blender/editors/interface/interface_handlers.c
M	source/blender/makesrna/intern/rna_wm_api.c
M	source/blender/windowmanager/intern/wm_operators.c

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

diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 6107502..38dfb0e 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -579,7 +579,7 @@ class WM_OT_context_pie_enum(Operator):
 
         context.window_manager.pie_menu(draw_func=draw_cb, title=prop.name, icon=prop.icon, event=event)
 
-        return {'PASS_THROUGH'}
+        return {'FINISHED'}
 
 
 class WM_OT_context_set_id(Operator):
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index f018c97..8dd96d9 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -6348,7 +6348,7 @@ static void ui_blocks_set_tooltips(ARegion *ar, const bool enable)
 static bool ui_mouse_inside_region(ARegion *ar, int x, int y)
 {
 	uiBlock *block;
-	
+
 	/* check if the mouse is in the region */
 	if (!BLI_rcti_isect_pt(&ar->winrct, x, y)) {
 		for (block = ar->uiblocks.first; block; block = block->next)
@@ -6396,9 +6396,8 @@ static void ui_block_calculate_pie_segment(const float mx, const float my, float
 
 static bool ui_mouse_inside_button(ARegion *ar, uiBut *but, int x, int y)
 {
-	uiBlock *block = but->block;
 	float mx, my;
-	float seg[2];
+	uiBlock *block = but->block;
 
 	if (!ui_mouse_inside_region(ar, x, y))
 		return false;
@@ -6408,11 +6407,11 @@ static bool ui_mouse_inside_button(ARegion *ar, uiBut *but, int x, int y)
 
 	ui_window_to_block_fl(ar, block, &mx, &my);
 
-	if (block->flag & UI_BLOCK_RADIAL) {
+	if (but->dt == UI_EMBOSSR) {
+		float seg[2];
+
 		ui_block_calculate_pie_segment(mx, my, seg, block);
-	}
 
-	if (but->dt == UI_EMBOSSR) {
 		if (!ui_but_isect_pie_seg(block, but, seg)) {
 			return false;
 		}
diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c
index ba0e8fe..b919e4c 100644
--- a/source/blender/makesrna/intern/rna_wm_api.c
+++ b/source/blender/makesrna/intern/rna_wm_api.c
@@ -310,7 +310,7 @@ static void rna_PupMenuEnd(bContext *C, PointerRNA *handle)
 	uiPupMenuEnd(C, handle->data);
 }
 
-/* popup menu wrapper */
+/* pie menu wrapper */
 static PointerRNA rna_PieMenuBegin(bContext *C, const char *title, int icon, int type)
 {
 	PointerRNA r_ptr;
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 0e2a3fc..eaee5dc 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2053,7 +2053,7 @@ static int wm_call_pie_menu_invoke(bContext *C, wmOperator *op, const wmEvent *e
 
 	uiPieMenuInvoke(C, idname, event->type);
 
-	return OPERATOR_CANCELLED;
+	return OPERATOR_FINISHED;
 }
 
 static void WM_OT_call_pie_menu(wmOperatorType *ot)