[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29981] branches/soc-2010-jwilkins/release /scripts/ui/space_view3d_toolbar.py: * made stroke method into a drop down menu

[Jason Wilkins]

Revision: 29981
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29981
Author:   jwilkins
Date:     2010-07-05 12:13:22 +0200 (Mon, 05 Jul 2010)

Log Message:
-----------
* made stroke method into a drop down menu
* made modifiers disappear unless they are relevant to current stroke method

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

Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py	2010-07-05 10:12:24 UTC (rev 29980)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py	2010-07-05 10:13:22 UTC (rev 29981)
@@ -898,48 +898,31 @@
         col = layout.column()
 
         if context.sculpt_object:
-            col.prop(brush, "stroke_method", expand=True)
+            col.label(text="Stroke Method:")
+            col.prop(brush, "stroke_method", text="")
 
-            row = col.row()
-            row.active = brush.use_anchor
-            row.label(text="Anchored:")
+            if brush.use_anchor:
+                col.separator()
+                row = col.row()
+                row.prop(brush, "edge_to_edge", "Edge To Edge")
 
-            row = col.row()
-            row.active = brush.use_anchor
-            row.prop(brush, "edge_to_edge", "Edge To Edge")
+            if brush.use_airbrush:
+                col.separator()
+                row = col.row()
+                row.prop(brush, "rate", text="Rate", slider=True)
 
-            col.separator()
+            if brush.use_smooth_stroke:
+                col.separator()
+                col = layout.column()
+                col.prop(brush, "smooth_stroke_radius", text="Radius", slider=True)
+                col.prop(brush, "smooth_stroke_factor", text="Factor", slider=True)
+                col = layout.column()
 
-            row = col.row()
-            row.active = brush.use_airbrush
-            row.label(text="Airbrush:")
-
-            row = col.row()
-            row.active = brush.use_airbrush
-            row.prop(brush, "rate", text="Rate", slider=True)
-
-            col.separator()
-
-            row = col.row()
-            row.active = brush.use_smooth_stroke
-            row.label(text="Smooth Stroke:")
-
-            col = layout.column()
-            col.active = brush.use_smooth_stroke
-            col.prop(brush, "smooth_stroke_radius", text="Radius", slider=True)
-            col.prop(brush, "smooth_stroke_factor", text="Factor", slider=True)
-
-            col.separator()
-
-            col = layout.column()
-
-            row = col.row()
-            row.active = brush.use_space
-            row.label(text="Space:")
-
-            row = col.row()
-            row.active = brush.use_space
-            row.prop(brush, "spacing", text="Spacing", slider=True)
+            if brush.use_space:
+                col.separator()
+                row = col.row()
+                row.active = brush.use_space
+                row.prop(brush, "spacing", text="Spacing", slider=True)
         else:
             row = col.row()
             row.prop(brush, "use_airbrush")