[Bf-blender-cvs] [481de5a5c8c] greasepencil-object: GPencil: Join Color and Vertex Color popover in UI

[Antonio Vazquez]

Commit: 481de5a5c8cf3d140cc117b88b4bf89981a6fff6
Author: Antonio Vazquez
Date:   Sun Nov 3 20:39:31 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB481de5a5c8cf3d140cc117b88b4bf89981a6fff6

GPencil: Join Color and Vertex Color popover in UI

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 2cd9d6a1574..97473ac0d40 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -353,7 +353,6 @@ class _draw_tool_settings_context_mode:
                 if gp_style.stroke_style != 'TEXTURE' or gp_style.use_stroke_pattern:
                     row.separator(factor=0.4)
                     row.prop(brush, "color", text="")
-                    row.separator(factor=0.4)
                     row.popover(
                         panel="TOPBAR_PT_gpencil_vertexcolor",
                         text="Vertex Color",
@@ -370,7 +369,6 @@ class _draw_tool_settings_context_mode:
         if context.object and brush.gpencil_tool == 'TINT':
             row.separator(factor=0.4)
             row.prop(brush, "color", text="")
-            row.separator(factor=0.4)
             row.popover(
                 panel="TOPBAR_PT_gpencil_vertexcolor",
                 text="Vertex Color",