diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-13 03:03:12 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-13 03:03:12 +0400 |
| commit | 9ebfcea8f392a0ac91247973d2e9ee06f689799c (patch) | |
| tree | 48ee1910bbe7156e262fd2329dc8346c1e314bfa /intern/cycles/render/nodes.cpp | |
| parent | 310b25c388aeaf43eeb4b0e4895cc5a24e44cd8e (diff) | |
Cycles: revert commit that joined surface/volume socket into a single shader socket,
on second thought this makes it a bit too difficult to understand what's going on.
Diffstat (limited to 'intern/cycles/render/nodes.cpp')
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 1609bfe8791..e6aff8590ad 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -2028,7 +2028,8 @@ void BlendWeightNode::compile(OSLCompiler& compiler) OutputNode::OutputNode() : ShaderNode("output") { - add_input("Closure", SHADER_SOCKET_CLOSURE); + add_input("Surface", SHADER_SOCKET_CLOSURE); + add_input("Volume", SHADER_SOCKET_CLOSURE); add_input("Displacement", SHADER_SOCKET_FLOAT); } @@ -2046,8 +2047,10 @@ void OutputNode::compile(SVMCompiler& compiler) void OutputNode::compile(OSLCompiler& compiler) { - if(compiler.output_type() == SHADER_TYPE_CLOSURE) - compiler.add(this, "node_output_closure"); + if(compiler.output_type() == SHADER_TYPE_SURFACE) + compiler.add(this, "node_output_surface"); + else if(compiler.output_type() == SHADER_TYPE_VOLUME) + compiler.add(this, "node_output_volume"); else if(compiler.output_type() == SHADER_TYPE_DISPLACEMENT) compiler.add(this, "node_output_displacement"); } |