[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55047] trunk/blender/source/blender/ blenkernel/intern/node.c: Fix #34507, adding reroute node into invalid links would crash the compositor.

[Lukas Toenne]

Revision: 55047
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55047
Author:   lukastoenne
Date:     2013-03-05 09:34:14 +0000 (Tue, 05 Mar 2013)
Log Message:
-----------
Fix #34507, adding reroute node into invalid links would crash the compositor.

Compositor relies on correctly tagged invalid links, but the nodeInternalRelink function used to replace reroute nodes in localization did not correctly take this flag into account. If a node replaces a link with an invalid upstream link the resulting link must also be flagged invalid.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2013-03-05 07:39:52 UTC (rev 55046)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2013-03-05 09:34:14 UTC (rev 55047)
@@ -571,6 +571,12 @@
 					link->fromnode = fromlink->fromnode;
 					link->fromsock = fromlink->fromsock;
 					
+					/* if the up- or downstream link is invalid,
+					 * the replacement link will be invalid too.
+					 */
+					if (!(fromlink->flag & NODE_LINK_VALID))
+						link->flag &= ~NODE_LINK_VALID;
+					
 					ntree->update |= NTREE_UPDATE_LINKS;
 				}
 				else