Commit: 929033a13b227e4e56dd7479c884645565222f58
Author: Antony Riakiotakis
Date: Sat May 31 00:51:41 2014 +0300
https://developer.blender.org/rB929033a13b227e4e56dd7479c884645565222f58
* Slight change on widget_box
* Pie menu operators return 'finished' to avoid evoking other operators
(maybe should be added to regular popup menus too?)
===================================================================
M release/scripts/startup/bl_operators/wm.py
M source/blender/editors/interface/interface_widgets.c
===================================================================
diff --git a/release/scripts/startup/bl_operators/wm.py
b/release/scripts/startup/bl_operators/wm.py
index ea556ee..6107502 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -527,7 +527,7 @@ class WM_OT_context_menu_enum(Operator):
context.window_manager.popup_menu(draw_func=draw_cb, title=prop.name,
icon=prop.icon)
- return {'PASS_THROUGH'}
+ return {'FINISHED'}
class WM_OT_context_operator_pie_enum(Operator):
bl_idname = "wm.context_operator_pie_enum"
@@ -553,7 +553,7 @@ class WM_OT_context_operator_pie_enum(Operator):
context.window_manager.pie_menu(draw_func=draw_cb, title=self.title,
event=event)
- return {'PASS_THROUGH'}
+ return {'FINISHED'}
class WM_OT_context_pie_enum(Operator):
diff --git a/source/blender/editors/interface/interface_widgets.c
b/source/blender/editors/interface/interface_widgets.c
index 636b1fc..07d0492 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -3684,8 +3684,9 @@ void ui_draw_pie_center(uiBlock *block)
glutil_draw_filled_arc(0.0, (float)(M_PI * 2.0), pie_radius_internal,
40);
glColor4ub(255, 255, 0, btheme->tui.wcol_menu_back.inner[3]);
- glBegin(GL_TRIANGLES);
+ glBegin(GL_TRIANGLE_FAN);
glVertex2f(block->pie_dir[0] * pie_radius_internal + block->pie_dir[1]
* 5.0, block->pie_dir[1] * pie_radius_internal - block->pie_dir[0] * 5.0);
+ glVertex2f(block->pie_dir[0] * (pie_radius_internal - 10.0f),
block->pie_dir[1] * (pie_radius_internal - 10.0f));
glVertex2f(block->pie_dir[0] * pie_radius_internal - block->pie_dir[1]
* 5.0, block->pie_dir[1] * pie_radius_internal + block->pie_dir[0] * 5.0);
glVertex2f(block->pie_dir[0] * (pie_radius_internal + 10.0f),
block->pie_dir[1] * (pie_radius_internal + 10.0f));
glEnd();
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
