[Bf-blender-cvs] [8359fa2] pie-menus: Pie menus:

[Antony Riakiotakis]

Commit: 8359fa245e05181a4d4e4dc5e775404ef104db11
Author: Antony Riakiotakis
Date:   Mon Jul 28 16:56:07 2014 +0200
Branches: pie-menus
https://developer.blender.org/rB8359fa245e05181a4d4e4dc5e775404ef104db11

Pie menus:

* Rename Align -> Center points in pivot menu
* Turn Manipulator on when a manipulator is selected in manipulator pie

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

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/makesrna/intern/rna_space.c

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 74bf703..2b337d5 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1458,7 +1458,7 @@ class VIEW3D_PIE_pivot(Menu):
 
         pie = layout.menu_pie()
         pie.prop(context.space_data, "pivot_point", expand=True)
-        pie.prop(context.space_data, "use_pivot_point_align")
+        pie.prop(context.space_data, "use_pivot_point_align", text="Center Points")
 
 class VIEW3D_PIE_snap(Menu):
     bl_label = "Snapping"
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 7b6ac86..5ba0633 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -360,6 +360,15 @@ static void rna_Space_view2d_sync_update(Main *UNUSED(bmain), Scene *UNUSED(scen
 	}
 }
 
+static void rna_Space_transform_manipulators_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
+{
+	View3D *v3d = ptr->data;
+
+	if (v3d->twtype != 0)
+		v3d->twflag |= V3D_USE_MANIPULATOR;
+}
+
+
 static PointerRNA rna_CurrentOrientation_get(PointerRNA *ptr)
 {
 	Scene *scene = ((bScreen *)ptr->id.data)->scene;
@@ -2124,7 +2133,7 @@ static void rna_def_space_view3d(BlenderRNA *brna)
 	RNA_def_property_enum_items(prop, manipulators_items);
 	RNA_def_property_flag(prop, PROP_ENUM_FLAG);
 	RNA_def_property_ui_text(prop, "Transform Manipulators", "Transformation manipulators");
-	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_Space_transform_manipulators_update");
 	
 	prop = RNA_def_property(srna, "transform_orientation", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "twmode");