[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40828] trunk/blender: hide 3d view header `use_pivot_point_align` button in editmode since its not used there , also remove unneeded copy() funcs from quick effects.

[Campbell Barton]

Revision: 40828
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40828
Author:   campbellbarton
Date:     2011-10-06 10:06:53 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
hide 3d view header `use_pivot_point_align` button in editmode since its not used there, also remove unneeded copy() funcs from quick effects.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py
    trunk/blender/source/blender/editors/space_view3d/view3d_header.c
    trunk/blender/source/blender/makesrna/intern/rna_space.c

Modified: trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py	2011-10-06 06:56:45 UTC (rev 40827)
+++ trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py	2011-10-06 10:06:53 UTC (rev 40828)
@@ -462,10 +462,10 @@
 
             if self.style == 'INFLOW':
                 mod.settings.type = 'INFLOW'
-                mod.settings.inflow_velocity = self.initial_velocity.copy()
+                mod.settings.inflow_velocity = self.initial_velocity
             else:
                 mod.settings.type = 'FLUID'
-                mod.settings.initial_velocity = self.initial_velocity.copy()
+                mod.settings.initial_velocity = self.initial_velocity
 
             obj.hide_render = not self.show_flows
             if not self.show_flows:

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_header.c	2011-10-06 06:56:45 UTC (rev 40827)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_header.c	2011-10-06 10:06:53 UTC (rev 40828)
@@ -530,8 +530,13 @@
 
 		row= uiLayoutRow(layout, 1);
 		uiItemR(row, &v3dptr, "pivot_point", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
-		uiItemR(row, &v3dptr, "use_pivot_point_align", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
 
+		/* pose/object only however we want to allow in weight paint mode too
+		 * so dont be totally strict and just check not-editmode for now */
+		if (obedit == NULL) {
+			uiItemR(row, &v3dptr, "use_pivot_point_align", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
+		}
+
 		/* Transform widget / manipulators */
 		row= uiLayoutRow(layout, 1);
 		uiItemR(row, &v3dptr, "show_manipulator", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c	2011-10-06 06:56:45 UTC (rev 40827)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c	2011-10-06 10:06:53 UTC (rev 40828)
@@ -1365,7 +1365,7 @@
 	
 	prop= RNA_def_property(srna, "use_pivot_point_align", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_ALIGN);
-	RNA_def_property_ui_text(prop, "Align", "Manipulate object centers only");
+	RNA_def_property_ui_text(prop, "Align", "Manipulate center points (object and pose mode only)");
 	RNA_def_property_ui_icon(prop, ICON_ALIGN, 0);
 	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, "rna_SpaceView3D_pivot_update");