diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-30 10:10:16 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-30 10:10:16 +0400 |
| commit | e7f594b0df56c99b19ce2eda50d7ca8872ac21e6 (patch) | |
| tree | 0b0e97576b6782034339e8bf5961b846949a29d9 /intern/cycles/render/nodes.cpp | |
| parent | 6bb45495d11e6547c847aee59dc86ca28adf472b (diff) | |
Fix #33347: cycles OSL crash connecting string to vector socket.
Diffstat (limited to 'intern/cycles/render/nodes.cpp')
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 12bbc019644..48fe63670c7 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -1124,6 +1124,8 @@ ConvertNode::ConvertNode(ShaderSocketType from_, ShaderSocketType to_) add_input("Point", SHADER_SOCKET_POINT); else if(from == SHADER_SOCKET_NORMAL) add_input("Normal", SHADER_SOCKET_NORMAL); + else if(from == SHADER_SOCKET_STRING) + add_input("String", SHADER_SOCKET_STRING); else assert(0); @@ -1139,6 +1141,8 @@ ConvertNode::ConvertNode(ShaderSocketType from_, ShaderSocketType to_) add_output("Point", SHADER_SOCKET_POINT); else if(to == SHADER_SOCKET_NORMAL) add_output("Normal", SHADER_SOCKET_NORMAL); + else if(to == SHADER_SOCKET_STRING) + add_output("String", SHADER_SOCKET_STRING); else assert(0); } |