Commit: da844af3a0219ba21fc8be019f074268883a96cf
Author: Antony Riakiotakis
Date: Tue Jul 29 17:42:07 2014 +0200
Branches: pie-menus
https://developer.blender.org/rBda844af3a0219ba21fc8be019f074268883a96cf
Proper fix for previous fix (tm)
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/editors/interface/interface_handlers.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index 71bc776..92f3be6 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1447,7 +1447,7 @@ class VIEW3D_PIE_manipulator(Menu):
pie = layout.menu_pie()
pie.prop(context.space_data, "transform_manipulators", expand=True)
- pie.operator("wm.context_toggle", icon='MANIPUL',
text="Toggle").data_path = "space_data.show_manipulator"
+ pie.prop(context.space_data, "show_manipulator")
diff --git a/source/blender/editors/interface/interface_handlers.c
b/source/blender/editors/interface/interface_handlers.c
index 2f2a9cc..7d493cb 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -8548,7 +8548,7 @@ static int ui_pie_menu_apply(bContext *C,
uiPopupBlockHandle *menu, uiBut *but,
}
else {
ui_apply_button(C, but->block, but, but->active, false);
- button_activate_exit((bContext *)C, but, but->active,
false, false);
+ button_activate_exit((bContext *)C, but, but->active,
false, true);
if (!(click_style || force_close)) {
but->block->pie_data.flags |= UI_PIE_FINISHED;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
