diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-22 16:22:15 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-22 16:22:15 +0400 |
| commit | 655e24979bb37c97a34b328238233591cfd5c924 (patch) | |
| tree | 62143c97a0dda18dc3908d07d2cd45657df1f1c2 /intern | |
| parent | ddc2dbc2a47ed2439a62e82ad6fba7d8c9dcae28 (diff) | |
Fix #32947: cycles color to float conversion issue after integer socket commit.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index da0dbc12740..2cdab3a6560 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -1124,6 +1124,9 @@ void ConvertNode::compile(SVMCompiler& compiler) compiler.add_node(NODE_CONVERT, NODE_CONVERT_IV, in->stack_offset, out->stack_offset); } else if(to == SHADER_SOCKET_FLOAT) { + compiler.stack_assign(in); + compiler.stack_assign(out); + if(from == SHADER_SOCKET_COLOR) /* color to float */ compiler.add_node(NODE_CONVERT, NODE_CONVERT_CF, in->stack_offset, out->stack_offset); @@ -1132,6 +1135,9 @@ void ConvertNode::compile(SVMCompiler& compiler) compiler.add_node(NODE_CONVERT, NODE_CONVERT_VF, in->stack_offset, out->stack_offset); } else if(to == SHADER_SOCKET_INT) { + compiler.stack_assign(in); + compiler.stack_assign(out); + if(from == SHADER_SOCKET_COLOR) /* color to int */ compiler.add_node(NODE_CONVERT, NODE_CONVERT_CI, in->stack_offset, out->stack_offset); |