[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30827] trunk/blender/release/scripts/ui: * moved Threaded Sculpt, Fast Navigate, and Show Brush back to Sculpt Options panel until they are properly moved in memory to the corresponding places they were in the UI .

[Jason Wilkins]

Revision: 30827
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30827
Author:   jwilkins
Date:     2010-07-28 09:19:54 +0200 (Wed, 28 Jul 2010)

Log Message:
-----------
* moved Threaded Sculpt, Fast Navigate, and Show Brush back to Sculpt Options panel until they are properly moved in memory to the corresponding places they were in the UI.  

Fast Navigate apparently needs to be made an option of the multires modifier

Threaded Sculpt and Show Brush need to be made UserPrefs

Some of these options were removed form UserPref panel without placing them anywhere else in the interface so this commit at least puts them somewhere so they can be used.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_data_modifier.py
    trunk/blender/release/scripts/ui/space_userpref.py
    trunk/blender/release/scripts/ui/space_view3d_toolbar.py

Modified: trunk/blender/release/scripts/ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_modifier.py	2010-07-28 07:00:40 UTC (rev 30826)
+++ trunk/blender/release/scripts/ui/properties_data_modifier.py	2010-07-28 07:19:54 UTC (rev 30827)
@@ -437,7 +437,6 @@
         col.prop(md, "levels", text="Preview")
         col.prop(md, "sculpt_levels", text="Sculpt")
         col.prop(md, "render_levels", text="Render")
-        col.prop(bpy.context.tool_settings.sculpt, "fast_navigate")
 
         if wide_ui:
             col = split.column()

Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py	2010-07-28 07:00:40 UTC (rev 30826)
+++ trunk/blender/release/scripts/ui/space_userpref.py	2010-07-28 07:19:54 UTC (rev 30827)
@@ -329,8 +329,7 @@
 
         col = row.column()
         row = col.row(align=True)
-        row.label("Overlay Color:")
-        row.prop(edit, "sculpt_paint_overlay_col", text="")
+        row.prop(edit, "sculpt_paint_overlay_col", text="Sculpt Overlay Color")
 
         col.separator()
         col.separator()

Modified: trunk/blender/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d_toolbar.py	2010-07-28 07:00:40 UTC (rev 30826)
+++ trunk/blender/release/scripts/ui/space_view3d_toolbar.py	2010-07-28 07:19:54 UTC (rev 30827)
@@ -1009,6 +1009,10 @@
 
         col = split.column()
 
+        col.prop(sculpt, "use_openmp", text="Threaded Sculpt")
+        col.prop(sculpt, "fast_navigate")
+        col.prop(sculpt, "show_brush")
+
         col.label(text="Unified Settings:")
         col.prop(tool_settings, "sculpt_paint_use_unified_size", text="Size")
         col.prop(tool_settings, "sculpt_paint_use_unified_strength", text="Strength")
@@ -1024,6 +1028,8 @@
         row.prop(sculpt, "lock_y", text="Y", toggle=True)
         row.prop(sculpt, "lock_z", text="Z", toggle=True)
 
+		
+		
 class VIEW3D_PT_sculpt_symmetry(PaintPanel):
     bl_label = "Symmetry"
     bl_default_closed = True