4 files changed, 11 insertions, 27 deletions

diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c
index 0a7f619d13c..86ef8a14c12 100644
--- a/source/blender/nodes/intern/node_common.c
+++ b/source/blender/nodes/intern/node_common.c
@@ -385,16 +385,13 @@ void register_node_type_frame(bNodeTreeType *ttype)
 /* **************** REROUTE ******************** */
 
 /* simple, only a single input and output here */
-static ListBase node_reroute_internal_connect(bNodeTree *ntree, bNode *node)
+static void node_reroute_update_internal_links(bNodeTree *ntree, bNode *node)
 {
 	bNodeLink *link;
-	ListBase ret;
-
-	ret.first = ret.last = NULL;
 
 	/* Security check! */
 	if (!ntree)
-		return ret;
+		return;
 
 	link = MEM_callocN(sizeof(bNodeLink), "internal node link");
 	link->fromnode = node;
@@ -403,9 +400,7 @@ static ListBase node_reroute_internal_connect(bNodeTree *ntree, bNode *node)
 	link->tosock = node->outputs.first;
 	/* internal link is always valid */
 	link->flag |= NODE_LINK_VALID;
-	BLI_addtail(&ret, link);
-
-	return ret;
+	BLI_addtail(&node->internal_links, link);
 }
 
 static void node_reroute_init(bNodeTree *ntree, bNode *node, bNodeTemplate *UNUSED(ntemp))
@@ -424,7 +419,7 @@ void register_node_type_reroute(bNodeTreeType *ttype)
 	
 	node_type_base(ttype, ntype, NODE_REROUTE, "Reroute", NODE_CLASS_LAYOUT, 0);
 	node_type_init(ntype, node_reroute_init);
-	node_type_internal_connect(ntype, node_reroute_internal_connect);
+	node_type_internal_links(ntype, node_reroute_update_internal_links);
 	
 	ntype->needs_free = 1;
 	nodeRegisterType(ttype, ntype);
diff --git a/source/blender/nodes/intern/node_exec.c b/source/blender/nodes/intern/node_exec.c
index 3040e8589fd..3cc7ebf9337 100644
--- a/source/blender/nodes/intern/node_exec.c
+++ b/source/blender/nodes/intern/node_exec.c
@@ -177,15 +177,9 @@ bNodeTreeExec *ntree_exec_begin(bNodeTree *ntree)
 		for (sock=node->inputs.first; sock; sock=sock->next)
 			node_init_input_index(sock, &index);
 		
-		if ((node->flag & NODE_MUTED || node->type == NODE_REROUTE)
-			&& node->typeinfo->internal_connect) {
-			
-			ListBase internal_links = node->typeinfo->internal_connect(ntree, node);
-			
+		if (node->flag & NODE_MUTED || node->type == NODE_REROUTE) {
 			for (sock=node->outputs.first; sock; sock=sock->next)
-				node_init_output_index(sock, &index, &internal_links);
-			
-			BLI_freelistN(&internal_links);
+				node_init_output_index(sock, &index, &node->internal_links);
 		}
 		else {
 			for (sock=node->outputs.first; sock; sock=sock->next)
diff --git a/source/blender/nodes/intern/node_util.c b/source/blender/nodes/intern/node_util.c
index 27258c45fe5..342c366fb48 100644
--- a/source/blender/nodes/intern/node_util.c
+++ b/source/blender/nodes/intern/node_util.c
@@ -109,18 +109,15 @@ const char *node_filter_label(bNode *node)
 	return IFACE_(name);
 }
 
-ListBase node_internal_connect_default(bNodeTree *ntree, bNode *node)
+void node_update_internal_links_default(bNodeTree *ntree, bNode *node)
 {
-	ListBase ret;
 	bNodeSocket *fromsock_first=NULL, *tosock_first=NULL;	/* used for fallback link if no other reconnections are found */
 	int datatype;
 	int num_links_in = 0, num_links_out = 0, num_reconnect = 0;
 
-	ret.first = ret.last = NULL;
-
 	/* Security check! */
 	if (!ntree)
-		return ret;
+		return;
 
 	for (datatype=0; datatype < NUM_SOCKET_TYPES; ++datatype) {
 		bNodeSocket *fromsock, *tosock;
@@ -170,7 +167,7 @@ ListBase node_internal_connect_default(bNodeTree *ntree, bNode *node)
 				ilink->tosock = tosock;
 				/* internal link is always valid */
 				ilink->flag |= NODE_LINK_VALID;
-				BLI_addtail(&ret, ilink);
+				BLI_addtail(&node->internal_links, ilink);
 				
 				++num_reconnect;
 			}
@@ -188,8 +185,6 @@ ListBase node_internal_connect_default(bNodeTree *ntree, bNode *node)
 		ilink->tosock = tosock_first;
 		/* internal link is always valid */
 		ilink->flag |= NODE_LINK_VALID;
-		BLI_addtail(&ret, ilink);
+		BLI_addtail(&node->internal_links, ilink);
 	}
-	
-	return ret;
 }
diff --git a/source/blender/nodes/intern/node_util.h b/source/blender/nodes/intern/node_util.h
index 95104df5fed..3134baa283c 100644
--- a/source/blender/nodes/intern/node_util.h
+++ b/source/blender/nodes/intern/node_util.h
@@ -62,7 +62,7 @@ const char *node_math_label(struct bNode *node);
 const char *node_vect_math_label(struct bNode *node);
 const char *node_filter_label(struct bNode *node);
 
-ListBase node_internal_connect_default(struct bNodeTree *ntree, struct bNode *node);
+void node_update_internal_links_default(struct bNodeTree *ntree, struct bNode *node);
 
 #endif