[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30781] trunk/blender/release/scripts/ui: Jason, from your merge 30325.
Campbell Barton
ideasman42 at gmail.com
Tue Jul 27 01:49:23 CEST 2010
Revision: 30781
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30781
Author: campbellbarton
Date: 2010-07-27 01:49:23 +0200 (Tue, 27 Jul 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_view3d.py
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py 2010-07-26 23:40:46 UTC (rev 30780)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2010-07-26 23:49:23 UTC (rev 30781)
@@ -327,16 +327,10 @@
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()
Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py 2010-07-26 23:40:46 UTC (rev 30780)
+++ trunk/blender/release/scripts/ui/space_view3d.py 2010-07-26 23:49:23 UTC (rev 30781)
@@ -1001,8 +1001,9 @@
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 @@
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 **********
More information about the Bf-blender-cvs
mailing list