sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

hide 3d view header use_pivot_point_align button in editmode since its not used there, also remove unneeded copy() funcs from quick effects.

Browse Source
This commit is contained in:
Campbell Barton 2011-10-06 10:06:53 +00:00
parent be143cc037
commit 8cfc183f84
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_operators/object_quick_effects.py
View File

@ -462,10 +462,10 @@ class QuickFluid(Operator):
if self.style == 'INFLOW': if self.style == 'INFLOW':
mod.settings.type = 'INFLOW' mod.settings.type = 'INFLOW'
mod.settings.inflow_velocity = self.initial_velocity.copy() mod.settings.inflow_velocity = self.initial_velocity
else: else:
mod.settings.type = 'FLUID' 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 obj.hide_render = not self.show_flows
if not self.show_flows: if not self.show_flows:

5
source/blender/editors/space_view3d/view3d_header.c
View File

@ -530,7 +530,12 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
row= uiLayoutRow(layout, 1); row= uiLayoutRow(layout, 1);
uiItemR(row, &v3dptr, "pivot_point", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); uiItemR(row, &v3dptr, "pivot_point", 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); uiItemR(row, &v3dptr, "use_pivot_point_align", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
}
/* Transform widget / manipulators */ /* Transform widget / manipulators */
row= uiLayoutRow(layout, 1); row= uiLayoutRow(layout, 1);

2
source/blender/makesrna/intern/rna_space.c
View 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); 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_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_ui_icon(prop, ICON_ALIGN, 0);
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, "rna_SpaceView3D_pivot_update"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_VIEW3D, "rna_SpaceView3D_pivot_update");