diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-05-30 19:47:12 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-05-30 19:47:12 +0400 |
| commit | 0e9b0f6d9eafb9a92f0589084d3ff05912a86ede (patch) | |
| tree | 652a51fc0fa0bd528a6660f7cc738f74bfbde456 /intern/cycles/render/graph.cpp | |
| parent | f462743daefc34f5dad98a46262aefe6cc4ea391 (diff) | |
Fix #31645, mix node results in crash upon render. This happens when unused mix nodes are removed from the cycles graph. In case the inputs are both unconnected it still tried to reconnect them.
Diffstat (limited to 'intern/cycles/render/graph.cpp')
| -rw-r--r-- | intern/cycles/render/graph.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp index 77bc9cf27ec..a0e7af66100 100644 --- a/intern/cycles/render/graph.cpp +++ b/intern/cycles/render/graph.cpp @@ -340,7 +340,8 @@ void ShaderGraph::remove_proxy_nodes(vector<bool>& removed) foreach(ShaderInput *input, inputs) { disconnect(input); - connect(output, input); + if (output) + connect(output, input); } } } |