[Bf-blender-cvs] [9912792] master: Forgot this in last commit. (Brick GLSL).

[Thomas Dinges]

Commit: 99127925642baf817902821eb2c530282aed9811
Author: Thomas Dinges
Date:   Mon Nov 7 20:59:09 2016 +0100
Branches: master
https://developer.blender.org/rB99127925642baf817902821eb2c530282aed9811

Forgot this in last commit. (Brick GLSL).

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

M	source/blender/gpu/shaders/gpu_shader_material.glsl

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

diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index b4e6356..4416b64 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -2880,7 +2880,7 @@ void node_tex_brick(vec3 co,
 		float facm = 1.0 - tint;
 		color1 = facm * color1 + tint * color2;
 	}
-	color = (f == 1.0) ? mortar : color1;
+	color = mix(color1, mortar, f);
 	fac = f;
 #else
 	color = vec4(1.0);