[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34389] trunk/blender/source/blender/ editors/space_node/node_edit.c: Added group verification after autoconnect to avoid linked+external group sockets .

Lukas Toenne lukas.toenne at googlemail.com
Tue Jan 18 15:49:06 CET 2011


Revision: 34389
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34389
Author:   lukastoenne
Date:     2011-01-18 14:49:06 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
Added group verification after autoconnect to avoid linked+external group sockets.

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

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2011-01-18 14:34:59 UTC (rev 34388)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2011-01-18 14:49:06 UTC (rev 34389)
@@ -1407,7 +1407,7 @@
 	ListBase *nodelist = MEM_callocN(sizeof(ListBase), "items_list");
 	bNodeListItem *nli;
 	bNode *node;
-	int i;
+	int i, numlinks=0;
 	
 	for(node= snode->edittree->nodes.first; node; node= node->next) {
 		if(node->flag & NODE_SELECT) {
@@ -1445,11 +1445,15 @@
 				nodeRemSocketLinks(snode->edittree, sock_to);
 			nodeAddLink(snode->edittree, node_fr, sock_fr, node_to, sock_to);
 			NodeTagChanged(snode->edittree, node_to);
+			++numlinks;
 			break;
 		}
 	}
 	
-	ntreeSolveOrder(snode->edittree);
+	if (numlinks > 0) {
+		node_tree_verify_groups(snode->nodetree);
+		ntreeSolveOrder(snode->edittree);
+	}
 	
 	BLI_freelistN(nodelist);
 	MEM_freeN(nodelist);




More information about the Bf-blender-cvs mailing list