merge with/from trunk at r35190
[blender.git] / source / blender / nodes / intern / SHD_nodes / SHD_output.c
index 548bc0670768cf172c8de0a662d5fc002831966e..12a6953363fad1ee865d122b2b0fc20fab684add 100644 (file)
@@ -38,7 +38,7 @@ static bNodeSocketType sh_node_output_in[]= {
 
 static void node_shader_exec_output(void *data, bNode *node, bNodeStack **in, bNodeStack **UNUSED(out))
 {
-       if(data) {
+       if(data && in[0] && in[1]) {
                ShadeInput *shi= ((ShaderCallData *)data)->shi;
                float col[4];