[Bf-blender-cvs] [ab347c83801] master: Fix T51115: Bump node is broken when the displacement socket is used

[Sergey Sharybin]

Commit: ab347c83801cc5b824ecf21d9aae9d8a0f356bc9
Author: Sergey Sharybin
Date:   Mon Apr 3 10:50:42 2017 +0200
Branches: master
https://developer.blender.org/rBab347c83801cc5b824ecf21d9aae9d8a0f356bc9

Fix T51115: Bump node is broken when the displacement socket is used

===================================================================

M	intern/cycles/render/graph.cpp

===================================================================

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");