[Bf-blender-cvs] [7c9c0d442ff] greasepencil-object: GPencil: Hide colorwheel in topbar

[Antonio Vazquez]

Commit: 7c9c0d442ff93a731c1b72ab9449fb33d06bfc4a
Author: Antonio Vazquez
Date:   Sun Nov 3 20:14:04 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB7c9c0d442ff93a731c1b72ab9449fb33d06bfc4a

GPencil: Hide colorwheel in topbar

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

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 4812a77e6d0..c1031cca258 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -2070,9 +2070,10 @@ class VIEW3D_PT_tools_grease_pencil_brush_mixcolor(View3DPanel, Panel):
         gp_settings = brush.gpencil_settings
         row = layout.row(align=True)
 
-        row.prop(brush, "color", text="")
-        row = layout.row(align=True)
-        row.template_color_picker(brush, "color", value_slider=True)
+        if context.area.type == 'PROPERTIES':
+            row.prop(brush, "color", text="")
+            row = layout.row(align=True)
+            row.template_color_picker(brush, "color", value_slider=True)
 
         if brush.gpencil_tool == 'DRAW':
             row = layout.row(align=True)