[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29757] branches/soc-2010-jwilkins/release /scripts/ui: more ui changes based on brects feedback, moved rake to the texture panel, and moved openmp (renamed threaded sculpt ) to the preferences panel

[Tom Musgrove]

Revision: 29757
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29757
Author:   letterrip
Date:     2010-06-28 05:03:05 +0200 (Mon, 28 Jun 2010)

Log Message:
-----------
more ui changes based on brects feedback, moved rake to the texture panel, and moved openmp (renamed threaded sculpt) to the preferences panel

Modified Paths:
--------------
    branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
    branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py

Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py	2010-06-28 00:57:27 UTC (rev 29756)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py	2010-06-28 03:03:05 UTC (rev 29757)
@@ -326,12 +326,14 @@
         row.separator()
         row.separator()
 
+        sculpt = context.tool_settings.sculpt
         col = row.column()
         col.label(text="Paint and Sculpt:")
         col.prop(edit, "use_unified_radius_and_strength", text="Unified Size and Strength")
         col.prop(edit, "sculpt_paint_pixel_radius", text="Unified Pixel Radius")
         col.prop(edit, "sculpt_paint_bu_radius", text="Unified BU Radius")
         col.prop(edit, "sculpt_paint_strength", text="Unified Strength")
+        col.prop(sculpt, "use_openmp", text="Threaded Sculpt")
 	
         col.separator()
         col.separator()

Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py	2010-06-28 00:57:27 UTC (rev 29756)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py	2010-06-28 03:03:05 UTC (rev 29757)
@@ -550,17 +550,17 @@
             row = col.row(align=True)
             row.prop(brush, "lock_brush_size", text="Use BUnits")
 
-            #row = col.row(align=True)
+            edit = context.user_preferences.edit
             if brush.lock_brush_size:
-                if bpy.context.user_preferences.edit.use_unified_radius_and_strength:
-                    row.prop(bpy.context.user_preferences.edit, "sculpt_paint_bu_radius", text ="Radius", slider=True)
+                if edit.use_unified_radius_and_strength:
+                    row.prop(edit, "sculpt_paint_bu_radius", text ="Radius", slider=True)
                 else:
-                    row.prop(brush, "unprojected_radius", text="Units", slider=True)
+                    row.prop(brush, "unprojected_radius", text="Radius", slider=True)
             else:
                 if bpy.context.user_preferences.edit.use_unified_radius_and_strength:
-                    row.prop(bpy.context.user_preferences.edit, "sculpt_paint_pixel_radius", text="Radius", slider=True)
+                    row.prop(edit, "sculpt_paint_pixel_radius", text="Radius", slider=True)
                 else:
-                    row.prop(brush, "size", text="Pixels", slider=True)
+                    row.prop(brush, "size", text="Radius", slider=True)
 
             if brush.sculpt_tool in ('GRAB', 'SNAKE_HOOK', 'THUMB'):
                 row = col.row(align=True)
@@ -573,10 +573,10 @@
                 row.prop(brush, "use_size_pressure", toggle=True, text="")
 
                 #row = col.row(align=True)
-                #row.prop(bpy.context.user_preferences.edit, "use_unified_radius_and_strength")
-                if bpy.context.user_preferences.edit.use_unified_radius_and_strength:
+                #row.prop(edit, "use_unified_radius_and_strength")
+                if edit.use_unified_radius_and_strength:
                     row = col.row(align=True)
-                    row.prop(bpy.context.user_preferences.edit, "sculpt_paint_strength", slider=True)
+                    row.prop(edit, "sculpt_paint_strength", slider=True)
 
                 else:
                     row = col.row(align=True)
@@ -737,6 +737,8 @@
                     if brush.use_texture_overlay:
                         row = col.row(align=True)
                         row.prop(brush, "texture_overlay_alpha", slider=True, text="Overlay Alpha")
+            row = col.row(align=True)
+            row.prop(brush, "use_rake")
 
 class VIEW3D_PT_tools_brush_tool(PaintPanel):
     bl_label = "Tool"
@@ -794,7 +796,6 @@
                 layout.prop(brush, "use_anchor")
                 if brush.use_anchor:
                     layout.prop(brush, "edge_to_edge", "Edge To Edge")
-            layout.prop(brush, "use_rake")
             if brush.sculpt_tool in ('DRAW', 'LAYER', 'FLATTEN', 'CLAY', 'WAX', 'FILL', 'SCRAPE'):
                 layout.prop(brush, "use_original_normal")
                 if brush.use_original_normal: