[Bf-blender-cvs] [50a0db12a62] greasepencil-object: GPencil: Display two colors only for required Tools

[Antonio Vazquez]

Commit: 50a0db12a62d5aedd0196e85438157589a3eb807
Author: Antonio Vazquez
Date:   Fri Nov 22 17:04:41 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB50a0db12a62d5aedd0196e85438157589a3eb807

GPencil: Display two colors only for required Tools

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.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 eefc9695249..8555ba222ac 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -312,13 +312,20 @@ class GreasePencilAppearancePanel:
             col = layout.column()
             col.active = gp_settings.use_cursor
 
-            if ob.mode in {'SCULPT_GPENCIL', 'WEIGHT_GPENCIL', 'VERTEX_GPENCIL'}:
-                tool = brush.gpencil_tool
-                if tool in {'GRAB', 'CLONE'}:
+            if ob.mode == 'SCULPT_GPENCIL':
+                tool = brush.gpencil_sculpt_tool
+                if tool in {'THICKNESS', 'STRENGTH', 'PINCH', 'TWIST'}:
                     col.prop(brush, "cursor_color_add", text="Add")
+                    col.prop(brush, "cursor_color_subtract", text="Subtract")
                 else:
                     col.prop(brush, "cursor_color_add", text="Add")
-                    col.prop(brush, "cursor_color_subtract", text="Subtract")
+
+            if ob.mode == 'WEIGHT_GPENCIL':
+                col.prop(brush, "cursor_color_add", text="Add")
+                col.prop(brush, "cursor_color_subtract", text="Subtract")
+
+            if ob.mode == 'VERTEX_GPENCIL':
+                col.prop(brush, "cursor_color_add", text="Add")
 
 
 class GreasePencilBrushFalloff: