[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37424] branches/soc-2011-onion/release/ scripts/startup/bl_ui/space_view3d_toolbar.py: UI adjustments for when masking was changed from a tool to a flag ( which will almost certainly change again)

[Jason Wilkins]

Revision: 37424
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37424
Author:   jwilkins
Date:     2011-06-12 01:41:07 +0000 (Sun, 12 Jun 2011)
Log Message:
-----------
UI adjustments for when masking was changed from a tool to a flag (which will almost certainly change again)

Modified Paths:
--------------
    branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py

Modified: branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-06-12 01:20:11 UTC (rev 37423)
+++ branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-06-12 01:41:07 UTC (rev 37424)
@@ -533,14 +533,16 @@
                 row.prop(brush, "strength", text="Strength", slider=True)
                 row.prop(brush, "use_pressure_strength", text="")
 
-            if brush.sculpt_tool not in {'MASK', 'SMOOTH'}:
+            #if brush.sculpt_tool not in {'MASK', 'SMOOTH'}:
+            if not brush.mask and brush.sculpt_tool not in {'SMOOTH'}:
                 col.separator()
 
                 row = col.row(align=True)
                 row.prop(brush, "auto_smooth_factor", slider=True)
                 row.prop(brush, "use_inverse_smooth_pressure", toggle=True, text="")
 
-            if brush.sculpt_tool not in ('MASK', 'GRAVITY'):
+            #if brush.sculpt_tool not in ('MASK', 'GRAVITY'):
+            if not brush.mask and brush.sculpt_tool not in ('GRAVITY'):
                 col.separator()
 
                 row = col.row(align=True)
@@ -558,7 +560,8 @@
                 row = col.row(align=True)
                 row.prop(brush, "crease_pinch_factor", slider=True, text="Pinch")
 
-            if brush.sculpt_tool not in {'MASK', 'PINCH', 'INFLATE', 'SMOOTH'}:
+            #if brush.sculpt_tool not in {'MASK', 'PINCH', 'INFLATE', 'SMOOTH'}:
+            if not brush.mask and brush.sculpt_tool not in {'PINCH', 'INFLATE', 'SMOOTH'}:
                 col.separator()
 
                 row = col.row(align=True)
@@ -597,7 +600,8 @@
             col.separator()
             col.row().prop(brush, "direction", expand=True)
 
-            if brush.sculpt_tool in ('DRAW', 'GRAVITY', 'CREASE', 'BLOB', 'INFLATE', 'LAYER', 'CLAY', 'CLAY_STRIP'):
+            #if brush.sculpt_tool in ('DRAW', 'GRAVITY', 'CREASE', 'BLOB', 'INFLATE', 'LAYER', 'CLAY', 'CLAY_STRIP'):
+            if not brush.mask and brush.sculpt_tool in ('DRAW', 'GRAVITY', 'CREASE', 'BLOB', 'INFLATE', 'LAYER', 'CLAY', 'CLAY_STRIP'):
                 col.separator()
 
                 col.prop(brush, "use_accumulate")
@@ -605,7 +609,8 @@
             col.separator()
             col.prop(brush, "mask")
 
-            if brush.sculpt_tool not in ('MASK', 'LAYER', 'GRAB', 'ROTATE', 'THUMB', 'SMOOTH'):
+            #if brush.sculpt_tool not in ('MASK', 'LAYER', 'GRAB', 'ROTATE', 'THUMB', 'SMOOTH'):
+            if not brush.mask and brush.sculpt_tool not in ('MASK', 'LAYER', 'GRAB', 'ROTATE', 'THUMB', 'SMOOTH'):
                 col.separator()
 
                 col.prop(brush, "use_layer", "Layer")
@@ -617,7 +622,8 @@
             if brush.sculpt_tool in ('LAYER'):
                 col.separator()
 
-            if brush.sculpt_tool not in ('MASK', 'GRAB', 'ROTATE', 'THUMB', 'SMOOTH'):
+            #if brush.sculpt_tool not in ('MASK', 'GRAB', 'ROTATE', 'THUMB', 'SMOOTH'):
+            if not brush.mask and brush.sculpt_tool not in ('MASK', 'GRAB', 'ROTATE', 'THUMB', 'SMOOTH'):
                 row = col.row()
                 row.prop(brush, "layer_limit", "Limit")
                 row.active = brush.use_layer