diff options
author | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-05-01 17:28:44 +0400 |
---|---|---|
committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-05-01 17:28:44 +0400 |
commit | 8843eb906388f9b014458f24bffb690a34ab4e5f (patch) | |
tree | dab8f83196c418f7a75001df6a4bf3b83c7d9570 | |
parent | 0440d77dbc87ea8c24bf7935a0b37f54bed69188 (diff) |
Fix for bug reported by Thomas Dinges on IRC: OSL script node was not initializing the data_type variable for shader sockets and so tried to set a non-existing float RNA property, leading to failed assert.
-rw-r--r-- | intern/cycles/blender/blender_python.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp index f7a05463f66..6c3b137fd52 100644 --- a/intern/cycles/blender/blender_python.cpp +++ b/intern/cycles/blender/blender_python.cpp @@ -258,6 +258,7 @@ static PyObject *osl_update_node_func(PyObject *self, PyObject *args) if(param->isclosure) { socket_type = "NodeSocketShader"; + data_type = BL::NodeSocket::type_SHADER; } else if(param->type.vecsemantics == TypeDesc::COLOR) { socket_type = "NodeSocketColor"; |