[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41469] trunk/blender/release/scripts/ startup/bl_ui/space_view3d_toolbar.py: Toolbar UI code:

[Thomas Dinges]

Revision: 41469
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41469
Author:   dingto
Date:     2011-11-02 15:58:56 +0000 (Wed, 02 Nov 2011)
Log Message:
-----------
Toolbar UI code:
* More cleanup. 

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-11-02 15:35:16 UTC (rev 41468)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-11-02 15:58:56 UTC (rev 41469)
@@ -481,12 +481,9 @@
             col.template_ID_preview(settings, "brush", new="brush.add", rows=3, cols=8)
 
         # Particle Mode #
-
-        # XXX This needs a check if psys is editable.
         if context.particle_edit_object:
             tool = settings.tool
 
-            # XXX Select Particle System
             layout.column().prop(settings, "tool", expand=True)
 
             if tool != 'NONE':
@@ -825,13 +822,11 @@
 
             if brush.use_anchor:
                 col.separator()
-                row = col.row()
-                row.prop(brush, "use_edge_to_edge", "Edge To Edge")
+                col.prop(brush, "use_edge_to_edge", "Edge To Edge")
 
             if brush.use_airbrush:
                 col.separator()
-                row = col.row()
-                row.prop(brush, "rate", text="Rate", slider=True)
+                col.prop(brush, "rate", text="Rate", slider=True)
 
             if brush.use_space:
                 col.separator()
@@ -857,8 +852,7 @@
                 row.prop(brush, "use_pressure_jitter", toggle=True, text="")
 
         else:
-            row = col.row()
-            row.prop(brush, "use_airbrush")
+            col.prop(brush, "use_airbrush")
 
             row = col.row()
             row.active = brush.use_airbrush and (not brush.use_space) and (not brush.use_anchor)
@@ -867,8 +861,7 @@
             col.separator()
 
             if not image_paint:
-                row = col.row()
-                row.prop(brush, "use_smooth_stroke")
+                col.prop(brush, "use_smooth_stroke")
 
                 col = layout.column()
                 col.active = brush.use_smooth_stroke
@@ -879,11 +872,9 @@
 
             col = layout.column()
             col.active = (not brush.use_anchor) and (brush.sculpt_tool not in {'GRAB', 'THUMB', 'ROTATE', 'SNAKE_HOOK'})
+            col.prop(brush, "use_space")
 
             row = col.row()
-            row.prop(brush, "use_space")
-
-            row = col.row()
             row.active = brush.use_space
             row.prop(brush, "spacing", text="Spacing")
 
@@ -1011,14 +1002,10 @@
         else:
             col.prop(brush, "cursor_color_add", text="Color")
 
-        col = layout.column()
-        col.label(text="Icon:")
-
-        row = col.row(align=True)
-        row.prop(brush, "use_custom_icon")
+        col = layout.column(align=True)
+        col.prop(brush, "use_custom_icon")
         if brush.use_custom_icon:
-            row = col.row(align=True)
-            row.prop(brush, "icon_filepath", text="")
+            col.prop(brush, "icon_filepath", text="")
 
 # ********** default tools for weight-paint ****************