sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for own mistake in r61178: bNodeTree->links ListBase was being modified while iterating ...

Browse Source
This commit is contained in:
Lukas Tönne 2013-11-15 16:54:05 +01:00
parent 9a78cda321
commit 53fffbafbe
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/space_node/node_relationships.c
View File

@ -401,22 +401,27 @@ static void node_remove_extra_links(SpaceNode *snode, bNodeLink *link)
bNodeSocket *from = link->fromsock, *to = link->tosock; bNodeSocket *from = link->fromsock, *to = link->tosock;
int max_from = from->limit, max_to = to->limit; int max_from = from->limit, max_to = to->limit;
int count_from = 1, count_to = 1; /* start at 1, link is included */ int count_from = 1, count_to = 1; /* start at 1, link is included */
bNodeLink *tlink; bNodeLink *tlink, *tlink_next;
for (tlink = ntree->links.first; tlink; tlink = tlink->next) { for (tlink = ntree->links.first; tlink; tlink = tlink_next) {
tlink_next = tlink->next;
if (tlink == link) if (tlink == link)
continue; continue;
if (tlink->fromsock == from) { if (tlink && tlink->fromsock == from) {
++count_from; ++count_from;
if (count_from > max_from) if (count_from > max_from) {
nodeRemLink(ntree, tlink); nodeRemLink(ntree, tlink);
tlink = NULL;
}
} }
if (tlink->tosock == to) { if (tlink && tlink->tosock == to) {
++count_to; ++count_to;
if (count_to > max_to) if (count_to > max_to) {
nodeRemLink(ntree, tlink); nodeRemLink(ntree, tlink);
tlink = NULL;
}
} }
} }
} }