Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonrad Kleine <konrad.wilhelm.kleine@gmail.com>2012-12-04 12:40:24 +0400
committerKonrad Kleine <konrad.wilhelm.kleine@gmail.com>2012-12-04 12:40:24 +0400
commit38dcce2da2183f6273e1132252f71bdd6ed0dea1 (patch)
tree5645567ee9ea47c25a467070545a71ad6a66f212 /intern/cycles/kernel/shaders/node_mix.osl
parent89d91f5a7d5187bb6fcdf5a4895cd5100a020f6a (diff)
FIX: OSL mix shader clamps 2nd color component to 3rd one.
Previously the OSL Mix shader node was clamping the 2nd color component (green) to the 3rd color component (blue). Now every component is clamped on its own.
Diffstat (limited to 'intern/cycles/kernel/shaders/node_mix.osl')
-rw-r--r--intern/cycles/kernel/shaders/node_mix.osl2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/shaders/node_mix.osl b/intern/cycles/kernel/shaders/node_mix.osl
index 69e68e5ed15..b2af36230f8 100644
--- a/intern/cycles/kernel/shaders/node_mix.osl
+++ b/intern/cycles/kernel/shaders/node_mix.osl
@@ -272,7 +272,7 @@ color node_mix_clamp(color col)
color outcol = col;
outcol[0] = clamp(col[0], 0.0, 1.0);
- outcol[1] = clamp(col[2], 0.0, 1.0);
+ outcol[1] = clamp(col[1], 0.0, 1.0);
outcol[2] = clamp(col[2], 0.0, 1.0);
return outcol;