diff options
author | Thomas Dinges <blender@dingto.org> | 2012-12-11 20:06:03 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2012-12-11 20:06:03 +0400 |
commit | 188718a3d57f3d869f228142ae30cce904e0e2e8 (patch) | |
tree | 8139c3d28378a5dd44aa5b0e187abeeb99d49516 /intern/cycles/kernel/shaders/node_mix.osl | |
parent | 92ae023a90adcac43a8079978eded9e0ca26a1ae (diff) |
OSL Shader Files:
* Simplify default color values, where each component was the same.
* Initialize closures as Null Closure, rather than assigning an existing closure, gets overwritten anyways.
Diffstat (limited to 'intern/cycles/kernel/shaders/node_mix.osl')
-rw-r--r-- | intern/cycles/kernel/shaders/node_mix.osl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/shaders/node_mix.osl b/intern/cycles/kernel/shaders/node_mix.osl index b2af36230f8..bcd00bb84e8 100644 --- a/intern/cycles/kernel/shaders/node_mix.osl +++ b/intern/cycles/kernel/shaders/node_mix.osl @@ -282,9 +282,9 @@ shader node_mix( string type = "Mix", int Clamp = 0, float Fac = 0.5, - color Color1 = color(0.0, 0.0, 0.0), - color Color2 = color(0.0, 0.0, 0.0), - output color Color = color(0.0, 0.0, 0.0)) + color Color1 = 0.0, + color Color2 = 0.0, + output color Color = 0.0) { float t = clamp(Fac, 0.0, 1.0); |