archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cycles: Remove compatibility code for OSL-1.4

Browse Source 
That code was mainly needed for the transition period, now we've
got all platforms updated to new OSL.

Plus there are some crucial fixes baking in the current upstream
sources which we'll need to have for the next Blender release.
This commit is contained in:
Sergey Sharybin
2014-11-04 15:52:41 +05:00
parent d5f978b3cc
commit ffbd9448c8
3 changed files with 0 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
intern/cycles/blender/blender_python.cpp
View File

@@ -385,13 +385,7 @@ static PyObject *osl_update_node_func(PyObject *self, PyObject *args)
/* find socket socket */
BL::NodeSocket b_sock(PointerRNA_NULL);
if (param->isoutput) {
#if OSL_LIBRARY_VERSION_CODE < 10500
b_sock = b_node.outputs[param->name];
#else
b_sock = b_node.outputs[param->name.string()];
#endif
/* remove if type no longer matches */
if(b_sock && b_sock.bl_idname() != socket_type) {
b_node.outputs.remove(b_sock);
@@ -399,12 +393,7 @@ static PyObject *osl_update_node_func(PyObject *self, PyObject *args)
}
}
else {
#if OSL_LIBRARY_VERSION_CODE < 10500
b_sock = b_node.inputs[param->name];
#else
b_sock = b_node.inputs[param->name.string()];
#endif
/* remove if type no longer matches */
if(b_sock && b_sock.bl_idname() != socket_type) {
b_node.inputs.remove(b_sock);