[Bf-blender-cvs] [6f8ee143405] greasepencil-object: Change color for grid lines

[Antonio Vazquez]

Commit: 6f8ee1434053f36f88d8a3937e7e2bd78307e458
Author: Antonio Vazquez
Date:   Fri Nov 24 10:38:53 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB6f8ee1434053f36f88d8a3937e7e2bd78307e458

Change color for grid lines

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

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

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

diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_paper_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_paper_frag.glsl
index 4aa5a574145..3e569b9377f 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_paper_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_paper_frag.glsl
@@ -9,6 +9,7 @@ void main()
 	vec2 uv = vec2(gl_FragCoord.xy);
 	float dx = size[0];
 	float dy = size[1];
+	vec4 gridcolor = vec4(0.8, 0.8, 0.8, 0.2);
 	/* avoid too small grid */
 	if (dx < 15.0) {
 		dx = 15.0;
@@ -22,11 +23,11 @@ void main()
 	if (uselines == 1) {
 		float difx = uv.x - (floor(uv.x / dx) * dx);
 		if (difx == 0.5) {
-			outcolor = vec4(0, 0, 0, 1);
+			outcolor = gridcolor;
 		}
 		float dify = uv.y - (floor(uv.y / dy) * dy);
 		if (dify == 0.5) {
-			outcolor = vec4(0, 0, 0, 1);
+			outcolor = gridcolor;
 		}
 	}