[Bf-blender-cvs] [e07aa09bd23] greasepencil-object: Fix pattern for Fill stroke

[Antonio Vazquez]

Commit: e07aa09bd232c13877af0063519157e25c8b3497
Author: Antonio Vazquez
Date:   Wed Feb 21 09:35:07 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe07aa09bd232c13877af0063519157e25c8b3497

Fix pattern for Fill stroke

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

M	source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl

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

diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
index eb337b36117..2a56dad0e89 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
@@ -122,9 +122,8 @@ void main()
 		}
 		/* pattern */
 		if (fill_type == PATTERN) {
-			/* normalize texture color */
-			float nvalue = 1.0 - ((text_color.x + text_color.y + text_color.z) / 3.0);
-			fragColor = mix(vec4(0.0, 0.0, 0.0, 0.0), finalColor, nvalue);
+			fragColor = finalColor;
+			fragColor.a = min(text_color.a, finalColor.a);
 		}
 	}