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/blender/blender_shader.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/blender/blender_shader.cpp')
-rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index c9a7f2756b7..b82e7dd47b7 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -114,9 +114,6 @@ static ShaderSocketType convert_osl_socket_type(OSL::OSLQuery& query, BL::NodeSocket& b_socket) { ShaderSocketType socket_type = convert_socket_type(b_socket); -#if OSL_LIBRARY_VERSION_CODE < 10701 - (void) query; -#else if(socket_type == SHADER_SOCKET_VECTOR) { /* TODO(sergey): Do we need compatible_name() here? */ const OSL::OSLQuery::Parameter *param = query.getparam(b_socket.name()); @@ -130,7 +127,7 @@ static ShaderSocketType convert_osl_socket_type(OSL::OSLQuery& query, } } } -#endif + return socket_type; } #endif /* WITH_OSL */ @@ -561,7 +558,7 @@ static ShaderNode *add_node(Scene *scene, * input/output type info needed for proper node construction. */ OSL::OSLQuery query; -#if OSL_LIBRARY_VERSION_CODE >= 10701 + if(!bytecode_hash.empty()) { query.open_bytecode(b_script_node.bytecode()); } @@ -569,7 +566,6 @@ static ShaderNode *add_node(Scene *scene, !OSLShaderManager::osl_query(query, b_script_node.filepath()); } /* TODO(sergey): Add proper query info error parsing. */ -#endif /* Generate inputs/outputs from node sockets * |