[Bf-blender-cvs] [809be0099ea] blender2.8: GP: Some changes in Appearance panel

Antonioya noreply at git.blender.org
Mon Sep 24 16:36:31 CEST 2018


Commit: 809be0099ea161eda0f149411651bd9fe84e1b6a
Author: Antonioya
Date:   Mon Sep 24 16:35:07 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB809be0099ea161eda0f149411651bd9fe84e1b6a

GP: Some changes in Appearance panel

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

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 760c5f8e259..0165ec1a340 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -346,9 +346,18 @@ class GreasePencilAppearancePanel:
 
             col = layout.column(align=True)
             col.prop(brush, "use_cursor", text="Show Brush")
-            col.row().prop(brush, "cursor_color_add", text="Add")
-            if tool in {'THICKNESS', 'STRENGTH', 'PINCH', 'TWIST'}:
-                col.row().prop(brush, "cursor_color_sub", text="Subtract")
+
+            if tool in {'THICKNESS', 'STRENGTH'}:
+                col.prop(brush, "cursor_color_add", text="Add")
+                col.prop(brush, "cursor_color_sub", text="Substract")
+            elif tool == 'PINCH':
+                col.prop(brush, "cursor_color_add", text="Pinch")
+                col.prop(brush, "cursor_color_sub", text="Inflate")
+            elif settings.tool == 'TWIST':
+                col.prop(brush, "cursor_color_add", text="CCW")
+                col.prop(brush, "cursor_color_sub", text="CW")
+            else:
+                col.prop(brush, "cursor_color_add", text="")
 
 
 class GPENCIL_MT_pie_tool_palette(Menu):



More information about the Bf-blender-cvs mailing list