[Bf-blender-cvs] [cb73de0e584] greasepencil-object: GPencil: Changes in panels of Vertex Paint mode

[Antonio Vazquez]

Commit: cb73de0e58484dcafb0564334e417acc90ff7345
Author: Antonio Vazquez
Date:   Thu Feb 27 16:27:14 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBcb73de0e58484dcafb0564334e417acc90ff7345

GPencil: Changes in panels of Vertex Paint mode

Remove duplicated color and change titles

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

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 0f8038a868a..c7a8fea5c38 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -2004,7 +2004,7 @@ class VIEW3D_PT_tools_grease_pencil_vertex_paint_settings(Panel, View3DPanel, Gr
 
 class VIEW3D_PT_tools_grease_pencil_brush_vertex_color(View3DPanel, Panel):
     bl_context = ".greasepencil_vertex"
-    bl_label = "Vertex Color"
+    bl_label = "Color"
     bl_category = "Tool"
 
     @classmethod
@@ -2033,7 +2033,6 @@ class VIEW3D_PT_tools_grease_pencil_brush_vertex_color(View3DPanel, Panel):
 
         col = layout.column()
 
-        col.prop(brush, "color", text="")
         col.template_color_picker(brush, "color", value_slider=True)
 
         sub_row = col.row(align=True)
@@ -2059,7 +2058,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_vertex_falloff(GreasePencilBrushFallof
 
 class VIEW3D_PT_tools_grease_pencil_brush_vertex_palette(View3DPanel, Panel):
     bl_context = ".greasepencil_vertex"
-    bl_label = "Color Palette"
+    bl_label = "Palette"
     bl_category = "Tool"
     bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_vertex_color'
 
@@ -2084,7 +2083,6 @@ class VIEW3D_PT_tools_grease_pencil_brush_vertex_palette(View3DPanel, Panel):
         layout.use_property_decorate = False
         ts = context.tool_settings
         settings = ts.gpencil_vertex_paint
-        brush = settings.brush
 
         col = layout.column()