diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-11-07 22:59:09 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-11-07 22:59:09 +0300 |
| commit | 99127925642baf817902821eb2c530282aed9811 (patch) | |
| tree | e0552618770051618a7fe4eccc740256f2dc4f7e /source/blender/gpu | |
| parent | 28639a22bcba4b6f09165188446e7919bab6fe6b (diff) | |
Forgot this in last commit. (Brick GLSL).
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_material.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl index b4e6356ada5..4416b6494f9 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); |