Forgot this in last commit. (Brick GLSL).
authorThomas Dinges <blender@dingto.org>
Mon, 7 Nov 2016 19:59:09 +0000 (20:59 +0100)
committerThomas Dinges <blender@dingto.org>
Mon, 7 Nov 2016 19:59:09 +0000 (20:59 +0100)
source/blender/gpu/shaders/gpu_shader_material.glsl

index b4e6356ada583560a453ed7770b8d9ac080f8be7..4416b6494f93cda2e4a0fabac113fb638de7b2b4 100644 (file)
@@ -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);