[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45034] trunk/blender/source/blender/ editors/space_node/node_templates.c: Remaining fix for #30606.

[Lukas Toenne]

Revision: 45034
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45034
Author:   lukastoenne
Date:     2012-03-20 17:56:12 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
Remaining fix for #30606. Added a simple link limit check when replacing nodes and relinking inputs, to avoid double links on inputs.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_templates.c

Modified: trunk/blender/source/blender/editors/space_node/node_templates.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_templates.c	2012-03-20 17:51:14 UTC (rev 45033)
+++ trunk/blender/source/blender/editors/space_node/node_templates.c	2012-03-20 17:56:12 UTC (rev 45034)
@@ -199,6 +199,9 @@
 
 		for(sock_prev=node_prev->inputs.first; sock_prev; sock_prev=sock_prev->next) {
 			for(sock_from=node_from->inputs.first; sock_from; sock_from=sock_from->next) {
+				if (nodeCountSocketLinks(ntree, sock_from) >= sock_from->limit)
+					continue;
+				
 				if(strcmp(sock_prev->name, sock_from->name) == 0 && sock_prev->type == sock_from->type) {
 					bNodeLink *link = sock_prev->link;