From 49df5d0980c3350bdcd34fa33220693f67f49e29 Mon Sep 17 00:00:00 2001 From: Mai Lavelle Date: Sun, 11 Sep 2016 13:39:12 -0400 Subject: Cycles: Fix shading and crashes resulting from constant folding on displacement Constant folding was removing all nodes connected to the displacement output if they evaluated to a constant, causing there to be no valid graph for displacement even when there was displacement to be applied, and sometimes caused crashes. --- intern/cycles/render/graph.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'intern') diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp index 9ee8b674412..ed8c7056aaa 100644 --- a/intern/cycles/render/graph.cpp +++ b/intern/cycles/render/graph.cpp @@ -483,6 +483,8 @@ void ShaderGraph::constant_fold() ShaderNodeSet done, scheduled; queue traverse_queue; + bool has_displacement = (output()->input("Displacement")->link != NULL); + /* Schedule nodes which doesn't have any dependencies. */ foreach(ShaderNode *node, nodes) { if(!check_node_inputs_has_links(node)) { @@ -520,6 +522,17 @@ void ShaderGraph::constant_fold() node->constant_fold(folder); } } + + /* Folding might have removed all nodes connected to the displacement output + * even tho there is displacement to be applied, so add in a value node if + * that happens to ensure there is still a valid graph for displacement. + */ + if(has_displacement && !output()->input("Displacement")->link) { + ValueNode *value = (ValueNode*)add(new ValueNode()); + value->value = output()->displacement; + + connect(value->output("Value"), output()->input("Displacement")); + } } /* Step 3: Simplification. */ -- cgit v1.2.3