[Bf-blender-cvs] [6cb90d180f4] master: Fix T63937: unconfirmed grease pencil strokes not visible in ortho suface

[Antonioya]

Commit: 6cb90d180f405e010f4588ec3cfe031f8dbac6cf
Author: Antonioya
Date:   Sat Apr 27 19:27:20 2019 +0200
Branches: master
https://developer.blender.org/rB6cb90d180f405e010f4588ec3cfe031f8dbac6cf

Fix T63937: unconfirmed grease pencil strokes not visible  in ortho suface

The value of the z-depth was too high. Now the value is valid for perspective and orthographic view.

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

M	source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
M	source/blender/draw/engines/gpencil/shaders/gpencil_point_geom.glsl
M	source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.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 68671a00337..16ec0ee9374 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_fill_frag.glsl
@@ -177,7 +177,7 @@ void main()
 
   /* set zdepth */
   if (xraymode == GP_XRAY_FRONT) {
-    gl_FragDepth = min(0.000001, (gl_FragCoord.z / gl_FragCoord.w));
+    gl_FragDepth = min(-0.05, (gl_FragCoord.z / gl_FragCoord.w));
   }
   else if (xraymode == GP_XRAY_3DSPACE) {
     /* if 3D mode, move slightly the fill to avoid z-fighting between stroke and fill on same stroke */
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_point_geom.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_point_geom.glsl
index a80598d9b63..a64a7ecb9be 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_point_geom.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_point_geom.glsl
@@ -31,7 +31,7 @@ vec2 toScreenSpace(vec4 vertex)
 float getZdepth(vec4 point)
 {
   if (xraymode == GP_XRAY_FRONT) {
-    return min(0.000001, (point.z / point.w));
+    return min(-0.05, (point.z / point.w));
   }
   if (xraymode == GP_XRAY_3DSPACE) {
     return (point.z / point.w);
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 20b066019c8..b90f5b33a57 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
@@ -35,7 +35,7 @@ vec2 toScreenSpace(vec4 vertex)
 float getZdepth(vec4 point)
 {
   if (xraymode == GP_XRAY_FRONT) {
-    return min(0.000001, (point.z / point.w));
+    return min(-0.05, (point.z / point.w));
   }
   if (xraymode == GP_XRAY_3DSPACE) {
     return (point.z / point.w);