diff options
author | Thomas Dinges <blender@dingto.org> | 2016-02-11 15:57:39 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2016-02-11 15:58:50 +0300 |
commit | 164dfbeb5039f5ac6c95d331049f7ea20ef5edef (patch) | |
tree | ab7f48d8ef7d4171fe1cad81d85720e5483f40a8 /intern/cycles/render/nodes.cpp | |
parent | 1e29849da02a092fbbcabca211bab7bd30dc0bf9 (diff) |
Cycles: Remove some ifdefs for OSL < 1.7.1.
That means that we now only support OSL 1.7.1 or newer. Please update libs or re-run install-depsh.sh.
Diffstat (limited to 'intern/cycles/render/nodes.cpp')
-rw-r--r-- | intern/cycles/render/nodes.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index c7b2087cf78..cb585377f97 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -4599,28 +4599,6 @@ void OSLScriptNode::compile(SVMCompiler& /*compiler*/) void OSLScriptNode::compile(OSLCompiler& compiler) { -#if defined(WITH_OSL) && (OSL_LIBRARY_VERSION_CODE < 10701) - /* XXX fix for #36790: - * point and normal parameters are reflected as generic SOCK_VECTOR sockets - * on the node. Socket fixed input values need to be copied explicitly here for - * vector sockets, otherwise OSL will reject the value due to mismatching type. - */ - foreach(ShaderInput *input, this->inputs) { - if(!input->link) { - /* no need for compatible_name here, OSL parameter names are always unique */ - string param_name(input->name); - switch(input->type) { - case SHADER_SOCKET_VECTOR: - compiler.parameter_point(param_name.c_str(), input->value); - compiler.parameter_normal(param_name.c_str(), input->value); - break; - default: - break; - } - } - } -#endif - if(!filepath.empty()) compiler.add(this, filepath.c_str(), true); else |