[Bf-blender-cvs] [a478edc] soc-2013-paint: Brush Color tidy-up.

[Antony Riakiotakis]

Commit: a478edcdeb2c7756a6b566ff658434c30c0d1618
Author: Antony Riakiotakis
Date:   Sun Apr 27 21:08:55 2014 +0300
https://developer.blender.org/rBa478edcdeb2c7756a6b566ff658434c30c0d1618

Brush Color tidy-up.

Nice UI mockup from so3Datel on blendeartists

===================================================================

M	release/scripts/startup/bl_ui/space_view3d_toolbar.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 5487af5..99d2897 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -964,26 +964,27 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel):
                 col.prop(brush, "use_gradient")
                 
                 if brush.use_gradient:
-                    if brush.image_tool == 'DRAW':
-                        col.prop(brush, "gradient_stroke_mode")
-                        if brush.gradient_stroke_mode in ('SPACING_REPEAT', 'SPACING_CLAMP'):
-                            col.prop(brush, "grad_spacing")
-                    elif brush.image_tool == 'FILL':
-                        col.prop(brush, "gradient_fill_mode")
-
                     col.label("Gradient Colors")
                     col.template_color_ramp(brush, "gradient", expand=True)
 
                     if brush.image_tool != 'FILL':
-                        col.label("Secondary Color")
-                        col.prop(brush, "secondary_color", text="")
-                        col.operator("paint.brush_colors_flip", icon='FILE_REFRESH')
+                        col.label("Background Color")            
+                        row = col.row(align=True)            
+                        row.prop(brush, "secondary_color", text="")
+
+                    if brush.image_tool == 'DRAW':
+                        col.prop(brush, "gradient_stroke_mode", text="Mode")
+                        if brush.gradient_stroke_mode in ('SPACING_REPEAT', 'SPACING_CLAMP'):
+                            col.prop(brush, "grad_spacing")
+                    elif brush.image_tool == 'FILL':
+                        col.prop(brush, "gradient_fill_mode")						
                 else:
-                    col = layout.column(align=True)            
-                    col.prop(brush, "color", text="")
+                    row = layout.row(align=True)            
+                    row.prop(brush, "color", text="")
                     if brush.image_tool != 'FILL':
-                        col.prop(brush, "secondary_color", text="")
-                        col.operator("paint.brush_colors_flip", icon='FILE_REFRESH')
+                        row.prop(brush, "secondary_color", text="")
+                        row.separator()
+                        row.operator("paint.brush_colors_flip", icon='FILE_REFRESH', text="")
 
                 col = layout.column()
                 col.prop(brush, "use_alpha")