[Bf-blender-cvs] [209ca1e] master: Fix T46139: Crash when inserting a node in a looped node structure

Sergey Sharybin noreply at git.blender.org
Thu Sep 17 13:17:10 CEST 2015


Commit: 209ca1e746b246a2bccd240eb9126a927bcd81f1
Author: Sergey Sharybin
Date:   Thu Sep 17 16:16:41 2015 +0500
Branches: master
https://developer.blender.org/rB209ca1e746b246a2bccd240eb9126a927bcd81f1

Fix T46139: Crash when inserting a node in a looped node structure

===================================================================

M	source/blender/blenkernel/intern/node.c

===================================================================

diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 3bcdb93..044ca4e 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -818,6 +818,10 @@ void nodeChainIter(
 	bNodeLink *link;
 
 	for (link = ntree->links.first; link; link = link->next) {
+		if (link->flag & NODE_LINK_VALID) {
+			/* Skip links marked as cyclic. */
+			continue;
+		}
 		if (link->tonode && link->fromnode) {
 			/* is the link part of the chain meaning node_start == fromnode (or tonode for reversed case)? */
 			if ((reversed && (link->tonode == node_start)) ||




More information about the Bf-blender-cvs mailing list