Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-04-03 11:50:42 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-04-03 11:51:00 +0300
commitab347c83801cc5b824ecf21d9aae9d8a0f356bc9 (patch)
treeccab9c113806bce5d977e43b80fc9314e8260ea4 /intern/cycles/render/graph.cpp
parent368b74315a58f66187b924cbc646abd05ce6a2b7 (diff)
Fix T51115: Bump node is broken when the displacement socket is used
Diffstat (limited to 'intern/cycles/render/graph.cpp')
-rw-r--r--intern/cycles/render/graph.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp
index 0362e8f834a..12fff8e5587 100644
--- a/intern/cycles/render/graph.cpp
+++ b/intern/cycles/render/graph.cpp
@@ -238,6 +238,8 @@ ShaderGraph *ShaderGraph::copy()
foreach(ShaderNode *node, nodes)
newgraph->add(nodes_copy[node]);
+ newgraph->simplified = simplified;
+
return newgraph;
}
@@ -245,7 +247,6 @@ void ShaderGraph::connect(ShaderOutput *from, ShaderInput *to)
{
assert(!finalized);
assert(from && to);
- simplified = false;
if(to->link) {
fprintf(stderr, "Cycles shader graph connect: input already connected.\n");