[Bf-blender-cvs] [5d2f63c0900] greasepencil-object: UI: More changes in Fill panel

[Antonio Vazquez]

Commit: 5d2f63c09000dee15f525e1a5ee8b47a160339c8
Author: Antonio Vazquez
Date:   Thu Jun 7 09:22:09 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB5d2f63c09000dee15f525e1a5ee8b47a160339c8

UI: More changes in Fill panel

Fix some issues with pattern type.

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

M	release/scripts/startup/bl_ui/properties_material_gpencil.py

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

diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index c3a8660ede6..d6a286bda57 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -223,7 +223,11 @@ class MATERIAL_PT_gpencil_fillcolor(GPMaterialButtonsPanel, Panel):
             # Texture
             if gpcolor.fill_style == 'TEXTURE' or (gpcolor.texture_mix is True and gpcolor.fill_style == 'SOLID'):
                 col.template_ID(gpcolor, "fill_image", open="image.open")
-                col.prop(gpcolor, "use_fill_pattern", text="Use As Pattern")
+
+                if gpcolor.fill_style == 'TEXTURE':
+                    col.prop(gpcolor, "use_fill_pattern", text="Use As Pattern")
+                    if gpcolor.use_fill_pattern is True:
+                        col.prop(gpcolor, "fill_color", text="Color")
 
                 col.prop(gpcolor, "texture_offset", text="Offset")
                 col.prop(gpcolor, "texture_scale", text="Scale")