diff options
author | Jacques Lucke <mail@jlucke.com> | 2019-10-15 18:31:44 +0300 |
---|---|---|
committer | Jacques Lucke <mail@jlucke.com> | 2019-10-15 18:31:44 +0300 |
commit | 2a9b162d94576d0182661179cf0500cfbc85236f (patch) | |
tree | 0104c1c0a43e7257734bb7fccb86bc4b766642a1 /intern/cycles/kernel/shaders | |
parent | c2a7e790475d185fc73e7f4210f3e458535d88b8 (diff) |
Fix T70605: incorrect darken and lighten rgb mix mode
Differential Revision: https://developer.blender.org/D6058
Reviewers: brecht, fclem
Diffstat (limited to 'intern/cycles/kernel/shaders')
-rw-r--r-- | intern/cycles/kernel/shaders/node_mix.osl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/shaders/node_mix.osl b/intern/cycles/kernel/shaders/node_mix.osl index 8caea6803ed..9fbd3391ade 100644 --- a/intern/cycles/kernel/shaders/node_mix.osl +++ b/intern/cycles/kernel/shaders/node_mix.osl @@ -91,12 +91,12 @@ color node_mix_diff(float t, color col1, color col2) color node_mix_dark(float t, color col1, color col2) { - return min(col1, col2) * t + col1 * (1.0 - t); + return mix(col1, min(col1, col2), t); } color node_mix_light(float t, color col1, color col2) { - return max(col1, col2 * t); + return mix(col1, max(col1, col2), t); } color node_mix_dodge(float t, color col1, color col2) |