Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Fix crash in constant folding introduced by recent commit

Browse Source 
Graph::disconnect() actually modifies links, needs to create a copy to iterate
if disconnect happens form inside the loop.

Question tho whether we can control this somehow..

Reported by BzztPloink in IRC, thanks!
This commit is contained in:
Sergey Sharybin
2015-11-25 20:01:08 +05:00
parent 485ea4353f
commit 1bec2aa54e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
intern/cycles/render/graph.cpp
View File

@@ -582,12 +582,13 @@ void ShaderGraph::constant_fold(set<ShaderNode*>& done, ShaderNode *node)
} }
/* Then fold self. */ /* Then fold self. */
foreach(ShaderOutput *sock, node->outputs) { foreach(ShaderOutput *output, node->outputs) {
float3 optimized_value = make_float3(0.0f, 0.0f, 0.0f); float3 optimized_value = make_float3(0.0f, 0.0f, 0.0f);
if(node->constant_fold(sock, &optimized_value)) { if(node->constant_fold(output, &optimized_value)) {
/* Apply optimized value to connected sockets */ /* Apply optimized value to connected sockets. */
foreach(ShaderInput *in, sock->links) { vector<ShaderInput*> links(output->links);
foreach(ShaderInput *in, links) {
in->value = optimized_value; in->value = optimized_value;
disconnect(in); disconnect(in);
} }