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:
authorThomas Dinges <blender@dingto.org>2012-12-11 20:06:03 +0400
committerThomas Dinges <blender@dingto.org>2012-12-11 20:06:03 +0400
commit188718a3d57f3d869f228142ae30cce904e0e2e8 (patch)
tree8139c3d28378a5dd44aa5b0e187abeeb99d49516 /intern/cycles/kernel/shaders/node_convert_from_int.osl
parent92ae023a90adcac43a8079978eded9e0ca26a1ae (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_convert_from_int.osl')
-rw-r--r--intern/cycles/kernel/shaders/node_convert_from_int.osl2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/shaders/node_convert_from_int.osl b/intern/cycles/kernel/shaders/node_convert_from_int.osl
index 911b4928db8..3d389cfa587 100644
--- a/intern/cycles/kernel/shaders/node_convert_from_int.osl
+++ b/intern/cycles/kernel/shaders/node_convert_from_int.osl
@@ -22,7 +22,7 @@ shader node_convert_from_int(
int ValInt = 0,
output string String = "",
output float Val = 0.0,
- output color Color = color(0.0, 0.0, 0.0),
+ output color Color = 0.0,
output vector Vector = vector(0.0, 0.0, 0.0),
output point Point = point(0.0, 0.0, 0.0),
output normal Normal = normal(0.0, 0.0, 0.0))