[Bf-blender-cvs] [9d2fce6479d] greasepencil-object: UI: Hide stroke color if stroke style is texture

[Antonio Vazquez]

Commit: 9d2fce6479db14bdc3bba8c141e0f6e897395b66
Author: Antonio Vazquez
Date:   Mon Jul 3 09:10:46 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB9d2fce6479db14bdc3bba8c141e0f6e897395b66

UI: Hide stroke color if stroke style is texture

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

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 73727835f10..de32b045aee 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -1141,8 +1141,9 @@ class GreasePencilPaletteColorPanel:
         col = split.column(align=True)
         col.enabled = not pcolor.lock
         col.label(text="Stroke:")
-        col.prop(pcolor, "color", text="")
-        col.prop(pcolor, "alpha", slider=True)
+        if pcolor.stroke_style != 'TEXTURE':
+            col.prop(pcolor, "color", text="")
+            col.prop(pcolor, "alpha", slider=True)
         col.prop(pcolor, "stroke_style", text="")
         if pcolor.stroke_style in ('TEXTURE', 'PATTERN'):
             col.template_ID(pcolor, "stroke_image", open="image.open")