[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35057] trunk/blender/source/blender/ blenkernel/intern/node.c: Fixed missing initialization of node stack entries.

Lukas Toenne lukas.toenne at googlemail.com
Tue Feb 22 08:58:49 CET 2011


Revision: 35057
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35057
Author:   lukastoenne
Date:     2011-02-22 07:58:49 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
Fixed missing initialization of node stack entries.

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	2011-02-22 07:57:18 UTC (rev 35056)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2011-02-22 07:58:49 UTC (rev 35057)
@@ -2195,18 +2195,24 @@
 {
 	bNodeTree *ntree= (bNodeTree *)gnode->id;
 	bNode *node;
+	bNodeSocket *sock;
 	
 	stack+= gnode->stack_index;
 	
 	for(node= ntree->nodes.first; node; node= node->next) {
 		if(node->typeinfo->execfunc) {
-			bNodeSocket *sock;
-			
 			for(sock= node->inputs.first; sock; sock= sock->next) {
 				bNodeStack *ns = get_socket_stack(stack, sock, gin);
 				ns->hasoutput= 1;
 			}
 		}
+		
+		/* set stack types (for local stack entries) */
+		for(sock= node->outputs.first; sock; sock= sock->next) {
+			bNodeStack *ns = get_socket_stack(stack, sock, NULL);
+			if (ns)
+				ns->sockettype = sock->type;
+		}
 	}
 }
 
@@ -2313,6 +2319,13 @@
 				}
 			}
 			
+			/* set stack types (for local stack entries) */
+			for(sock= node->outputs.first; sock; sock= sock->next) {
+				ns = get_socket_stack(ntree->stack, sock, NULL);
+				if (ns)
+					ns->sockettype = sock->type;
+			}
+			
 			if(node->type==NODE_GROUP && node->id) {
 				node_get_stack(node, ntree->stack, nsin, NULL, NULL);
 				group_tag_used_outputs(node, ntree->stack, nsin);




More information about the Bf-blender-cvs mailing list