hide 3d view header `use_pivot_point_align` button in editmode since its not used...
authorCampbell Barton <ideasman42@gmail.com>
Thu, 6 Oct 2011 10:06:53 +0000 (10:06 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 6 Oct 2011 10:06:53 +0000 (10:06 +0000)
release/scripts/startup/bl_operators/object_quick_effects.py
source/blender/editors/space_view3d/view3d_header.c
source/blender/makesrna/intern/rna_space.c

index c13a04eb87aa544062c87f3eeadd757a8679caf2..490ee23022017d4082e5a726e08bfa149a466f91 100644 (file)
@@ -462,10 +462,10 @@ class QuickFluid(Operator):
 
             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:
index 44d85af858c2b40f40e477a025c304c37a112dda..fd27dc65a0ed54e81078510ac38a249fe06c373d 100644 (file)
@@ -530,7 +530,12 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 
                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);
index 560e2dbcd8e43fd32fa0b92bb779487af6b0ea85..8afcd61b9c80363faa81d99db9c34cdea43e3d2b 100644 (file)
@@ -1365,7 +1365,7 @@ static void rna_def_space_view3d(BlenderRNA *brna)
        
        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");