From 5f63797c0985c9be8e0bf57fcc9aa1893a896af7 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Thu, 4 Aug 2016 14:48:34 +0300 Subject: Cycles: copy shader node names over in the blender sync code. This makes constant folding logs with --debug-cycles more meaningful. A tiny fix is needed in OSL generator to match recent node refactoring. --- intern/cycles/render/osl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/render') diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 676afad997e..1a6ae5f9277 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -549,7 +549,7 @@ string OSLCompiler::id(ShaderNode *node) { /* assign layer unique name based on pointer address + bump mode */ stringstream stream; - stream << "node_" << node->name << "_" << node; + stream << "node_" << node->type->name << "_" << node; return stream.str(); } -- cgit v1.2.3