[Bf-blender-cvs] [c5e99ab] master: Temporary solution for Add/Subtract toggles being meaningless for some GPencil brushes

[Joshua Leung]

Commit: c5e99abe70b5059adc6636313f0cedca2d77be7e
Author: Joshua Leung
Date:   Wed Dec 16 02:57:06 2015 +1300
Branches: master
https://developer.blender.org/rBc5e99abe70b5059adc6636313f0cedca2d77be7e

Temporary solution for Add/Subtract toggles being meaningless for some GPencil brushes

For now, we just change the labels of these toggles so that it makes sense what
results we should expect from each. A better solution may be to create separate
"direction" props for the different brush types here, so that we can also define
more appropriate tooltips too to go with the labels.

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

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 9bb31a2..56373c7 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -208,8 +208,16 @@ class GreasePencilStrokeSculptPanel:
 
         layout.separator()
 
-        if settings.tool in {'THICKNESS', 'PINCH', 'TWIST'}:
+        if settings.tool == 'THICKNESS':
             layout.row().prop(brush, "direction", expand=True)
+        elif settings.tool == 'PINCH':
+            row = layout.row(align=True)
+            row.prop_enum(brush, "direction", 'ADD', text="Pinch")
+            row.prop_enum(brush, "direction", 'SUBTRACT', text="Inflate")
+        elif settings.tool == 'TWIST':
+            row = layout.row(align=True)
+            row.prop_enum(brush, "direction", 'SUBTRACT', text="CW")
+            row.prop_enum(brush, "direction", 'ADD', text="CCW")
 
         layout.separator()
         layout.prop(settings, "use_select_mask")