[Bf-blender-cvs] [11f5d0e3391] greasepencil-object: GPencil: More test for textured strokes

[Antonioya]

Commit: 11f5d0e3391658addcaee060e449bbd1e9ae356e
Author: Antonioya
Date:   Wed Mar 13 16:36:08 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB11f5d0e3391658addcaee060e449bbd1e9ae356e

GPencil: More test for textured strokes

Now the texture is inverted in alternate segments.

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

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

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

diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
index 5cbeff1c7f5..4ab7ef7be09 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
@@ -184,18 +184,21 @@ void main(void)
 
 	float uv_x1 = finaluvdata[1].x;
 	float uv_x2 = finaluvdata[2].x;
+	float d = 0;
 	/* normalize UVs */
 	if (uv_x2 > 1.0) {
-		float d = ceil(uv_x2) - 1.0;
+		d = ceil(uv_x2) - 1.0;
 		uv_x1 = uv_x1 - d;
 		uv_x2 = uv_x2 - d;
 	}
 
-	/* invert uv if random angle (angles equal to 0 keep unchanged) */
-	if ((finaluvdata[1].y > 0.0) || (finaluvdata[1].y < 0.25)) {
-		float t = uv_x2;
-		uv_x2 = uv_x1;
-		uv_x1 = t;
+	/* invert uv */
+	if ((finaluvdata[1].y != 0.0) && (finaluvdata[2].y != 0.0)) {
+		if (floor(d / 2.0) == (d / 2.0)) {
+			float t = uv_x2;
+			uv_x2 = uv_x1;
+			uv_x1 = t;
+		}
 	}
 	
 	/* generate the triangle strip */