diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-06 14:06:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-06 14:06:53 +0400 |
| commit | 8cfc183f8419967877b87cc923f1544750b8952d (patch) | |
| tree | b0dd68add57b5ff28ca7e677987f20fa76a93880 | |
| parent | be143cc037ad80dd792546bf0e2bd22b70c32ffe (diff) | |
hide 3d view header `use_pivot_point_align` button in editmode since its not used there, also remove unneeded copy() funcs from quick effects.
| -rw-r--r-- | release/scripts/startup/bl_operators/object_quick_effects.py | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_header.c | 7 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_operators/object_quick_effects.py b/release/scripts/startup/bl_operators/object_quick_effects.py index c13a04eb87a..490ee230220 100644 --- a/release/scripts/startup/bl_operators/object_quick_effects.py +++ b/release/scripts/startup/bl_operators/object_quick_effects.py @@ -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: diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 44d85af858c..fd27dc65a0e 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -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); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 560e2dbcd8e..8afcd61b9c8 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -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"); |