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

Jason, from your merge 30325.

Browse Source 
move toolsettings out of the userprefs into the sculpt menu, if these should be userprefs then they should be moved into that struct.
This commit is contained in:
Campbell Barton 2010-07-26 23:49:23 +00:00
parent 63791e03d6
commit 432ec37965
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/scripts/ui/space_userpref.py
View File

@ -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()

15
release/scripts/ui/space_view3d.py
View File

@ -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 **********