archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Tile fix: Use the validity flag in node links directly instead of the indirect node level check for cyclic links to avoid crash in cases of invalid links, which can be created in some situations (reroute nodes). The link flag may have been set by additional constraints. It is much simpler to use and avoids the redundant check.

Browse Source
This commit is contained in:
Lukas Toenne
2012-08-06 19:11:59 +00:00
parent f961afece0
commit 723e52fb85
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
View File

@@ -154,12 +154,9 @@ static OutputSocket *find_output(NodeRange &node_range, bNode *bnode, bNodeSocke
} }
SocketConnection *ExecutionSystemHelper::addNodeLink(NodeRange &node_range, vector<SocketConnection *>& links, bNodeLink *b_nodelink) SocketConnection *ExecutionSystemHelper::addNodeLink(NodeRange &node_range, vector<SocketConnection *>& links, bNodeLink *b_nodelink)
{ {
/// @note: cyclic lines will be ignored. This has been copied from node.c /// @note: ignore invalid links
if (b_nodelink->tonode != 0 && b_nodelink->fromnode != 0) { if (!(b_nodelink->flag & NODE_LINK_VALID))
if (!(b_nodelink->fromnode->level >= b_nodelink->tonode->level && b_nodelink->tonode->level != 0xFFF)) { // only add non cyclic lines! so execution will procede return NULL;
return NULL;
}
}
InputSocket *inputSocket = find_input(node_range, b_nodelink->tonode, b_nodelink->tosock); InputSocket *inputSocket = find_input(node_range, b_nodelink->tonode, b_nodelink->tosock);
OutputSocket *outputSocket = find_output(node_range, b_nodelink->fromnode, b_nodelink->fromsock); OutputSocket *outputSocket = find_output(node_range, b_nodelink->fromnode, b_nodelink->fromsock);