[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30569] trunk/blender/release/scripts/ui/ space_image.py: making this consistent with texture brush selector in the 3d viewport

[Tom Musgrove]

Revision: 30569
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30569
Author:   letterrip
Date:     2010-07-21 10:23:57 +0200 (Wed, 21 Jul 2010)

Log Message:
-----------
making this consistent with texture brush selector in the 3d viewport

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_image.py

Modified: trunk/blender/release/scripts/ui/space_image.py
===================================================================
--- trunk/blender/release/scripts/ui/space_image.py	2010-07-21 07:55:53 UTC (rev 30568)
+++ trunk/blender/release/scripts/ui/space_image.py	2010-07-21 08:23:57 UTC (rev 30569)
@@ -562,23 +562,11 @@
 
         toolsettings = context.tool_settings.image_paint
         brush = toolsettings.brush
-        wide_ui = context.region.width > narrowui
 
         col = layout.split().column()
         row = col.row()
-        row.template_list(toolsettings, "brushes", toolsettings, "active_brush_index", rows=2)
+        col.template_ID_preview(toolsettings, "brush", new="brush.add", filter="is_imapaint_brush", rows=3, cols=8)
 
-        col.template_ID(toolsettings, "brush", new="brush.add")
-
-        if wide_ui:
-            sub = layout.row(align=True)
-        else:
-            sub = layout.column(align=True)
-        sub.prop_enum(brush, "imagepaint_tool", 'DRAW')
-        sub.prop_enum(brush, "imagepaint_tool", 'SOFTEN')
-        sub.prop_enum(brush, "imagepaint_tool", 'CLONE')
-        sub.prop_enum(brush, "imagepaint_tool", 'SMEAR')
-
         if brush:
             col = layout.column()
             col.template_color_wheel(brush, "color", value_slider=True)