From 8843eb906388f9b014458f24bffb690a34ab4e5f Mon Sep 17 00:00:00 2001 From: Lukas Toenne Date: Wed, 1 May 2013 13:28:44 +0000 Subject: 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. --- intern/cycles/blender/blender_python.cpp | 1 + 1 file changed, 1 insertion(+) 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"; -- cgit v1.2.3