[Bf-blender-cvs] [c3f0b0ff431] greasepencil-object: GPencil: Remove double color swatch in popover

[Antonio Vazquez]

Commit: c3f0b0ff431de40c2272de8ff1821a078dc90479
Author: Antonio Vazquez
Date:   Thu Feb 27 12:48:21 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBc3f0b0ff431de40c2272de8ff1821a078dc90479

GPencil: Remove double color swatch in popover

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 7a814ba2743..a1481c5c16f 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -652,7 +652,6 @@ class GreasePencilVertexcolorPanel:
 
         if ob:
             col = layout.column()
-            col.prop(brush, "color", text="")
             col.template_color_picker(brush, "color", value_slider=True)
 
             sub_row = layout.row(align=True)
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 21937a60208..84c4beb5b66 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -2144,7 +2144,6 @@ class VIEW3D_PT_tools_grease_pencil_brush_mixcolor(View3DPanel, Panel):
         col = layout.column()
         col.enabled = settings.use_vertex_color == 'VERTEXCOLOR' or brush.gpencil_tool == 'TINT'
 
-        col.prop(brush, "color", text="")
         col.template_color_picker(brush, "color", value_slider=True)
 
         sub_row = col.row(align=True)