[Bf-blender-cvs] [5f63797] master: Cycles: copy shader node names over in the blender sync code.
Alexander Gavrilov
noreply at git.blender.org
Thu Aug 4 14:43:15 CEST 2016
Commit: 5f63797c0985c9be8e0bf57fcc9aa1893a896af7
Author: Alexander Gavrilov
Date: Thu Aug 4 14:48:34 2016 +0300
Branches: master
https://developer.blender.org/rB5f63797c0985c9be8e0bf57fcc9aa1893a896af7
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.
===================================================================
M intern/cycles/blender/blender_shader.cpp
M intern/cycles/render/osl.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index 6455980..2fe8ee9 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -837,8 +837,10 @@ static ShaderNode *add_node(Scene *scene,
}
}
- if(node)
+ if(node) {
+ node->name = b_node.name();
graph->add(node);
+ }
return node;
}
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index 676afad..1a6ae5f 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();
}
More information about the Bf-blender-cvs
mailing list