From 432ec37965837c6ed63faec6df57fd53c04ed220 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 26 Jul 2010 23:49:23 +0000 Subject: [PATCH] Jason, from your merge 30325. move toolsettings out of the userprefs into the sculpt menu, if these should be userprefs then they should be moved into that struct. --- release/scripts/ui/space_userpref.py | 6 ------ release/scripts/ui/space_view3d.py | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py index 5bbf3e6d98d..d543d9a4531 100644 --- a/release/scripts/ui/space_userpref.py +++ b/release/scripts/ui/space_userpref.py @@ -327,16 +327,10 @@ class USERPREF_PT_edit(bpy.types.Panel): row.separator() row.separator() - sculpt = context.tool_settings.sculpt col = row.column() - col.label(text="Paint and Sculpt:") - col.prop(edit, "sculpt_paint_use_unified_size", text="Unify Size") - col.prop(edit, "sculpt_paint_use_unified_strength", text="Unify Strength") row = col.row(align=True) row.label("Overlay Color:") row.prop(edit, "sculpt_paint_overlay_col", text="") - col.prop(sculpt, "use_openmp", text="Threaded Sculpt") - col.prop(sculpt, "show_brush") col.separator() col.separator() diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index 12b3c508ac2..5d22c3b41bb 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -1001,8 +1001,9 @@ class VIEW3D_MT_sculpt(bpy.types.Menu): def draw(self, context): layout = self.layout - sculpt = context.tool_settings.sculpt - brush = context.tool_settings.sculpt.brush + tool_settings = context.tool_settings + sculpt = tool_settings.sculpt + brush = tool_settings.sculpt.brush layout.prop(sculpt, "symmetry_x") layout.prop(sculpt, "symmetry_y") @@ -1024,12 +1025,20 @@ class VIEW3D_MT_sculpt(bpy.types.Menu): layout.prop(brush, "use_anchor") if sculpt_tool in ('DRAW', 'PINCH', 'INFLATE', 'LAYER', 'CLAY'): - layout.prop(brush, "flip_direction") + layout.prop(brush, "direction") if sculpt_tool == 'LAYER': layout.prop(brush, "use_persistent") layout.operator("sculpt.set_persistent_base") + layout.separator() + layout.prop(sculpt, "use_openmp", text="Threaded Sculpt") + layout.prop(sculpt, "show_brush") + + # TODO, make availabel from paint menu! + layout.prop(tool_settings, "sculpt_paint_use_unified_size", text="Unify Size") + layout.prop(tool_settings, "sculpt_paint_use_unified_strength", text="Unify Strength") + # ********** Particle menu **********