[Bf-blender-cvs] [09ede1f3bbc] greasepencil-object: UI: Move default color to main brush panel

[Antonio Vazquez]

Commit: 09ede1f3bbc8a74cd85a1af5a6027cea9d82025c
Author: Antonio Vazquez
Date:   Tue Mar 13 15:47:18 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB09ede1f3bbc8a74cd85a1af5a6027cea9d82025c

UI: Move default color to main brush panel

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

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 ba320173a4f..e17919e4aee 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -2096,6 +2096,12 @@ class VIEW3D_PT_tools_grease_pencil_brush(Panel):
                 row.prop(brush, "pen_strength", slider=True)
                 row.prop(brush, "use_strength_pressure", text="", icon='STYLUS_PRESSURE')
 
+                row = layout.row(align=True)
+                row.template_ID(brush, "palette")
+                if brush.palette:
+                    row = layout.row(align=True)
+                    row.prop_search(brush, "colorname", brush.palette, "colors", text="Color", icon="LAYER_ACTIVE")
+
             if brush.gpencil_brush_type == 'FILL':
                 col = layout.column(align=True)
                 col.prop(brush, "gpencil_fill_leak", text="Leak Size")
@@ -2156,14 +2162,6 @@ class VIEW3D_PT_tools_grease_pencil_brush_option(Panel):
             col.prop(brush, "active_smooth_factor")
             col.separator()
 
-            col.label("Color Settings:")
-            col.template_ID(brush, "palette")
-            if brush.palette:
-                col.separator()
-                subcol = col.column()
-                subcol.prop_search(brush, "colorname", brush.palette, "colors", text="Color", icon="LAYER_ACTIVE")
-            col.separator()
-
             if brush.gpencil_brush_type == 'DRAW':
                 col.prop(brush, "use_stabilizer", text="Stabilizer")
                 if brush.use_stabilizer: