[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31964] branches/particles-2010/source/ blender/nodes/intern/simulation/node_tree_simulation.c: reenabled context type adaptation while updating, which allows a partial validity check.

[Lukas Toenne]

Revision: 31964
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31964
Author:   lukastoenne
Date:     2010-09-16 12:39:50 +0200 (Thu, 16 Sep 2010)

Log Message:
-----------
reenabled context type adaptation while updating, which allows a partial validity check.

Modified Paths:
--------------
    branches/particles-2010/source/blender/nodes/intern/simulation/node_tree_simulation.c

Modified: branches/particles-2010/source/blender/nodes/intern/simulation/node_tree_simulation.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/simulation/node_tree_simulation.c	2010-09-16 09:53:04 UTC (rev 31963)
+++ branches/particles-2010/source/blender/nodes/intern/simulation/node_tree_simulation.c	2010-09-16 10:39:50 UTC (rev 31964)
@@ -279,8 +279,7 @@
 	}
 }
 
-#if 0
-void ntreeResolveInputContexts(bNode *node)
+static void resolve_input_contexts(bNode *node)
 {
 	bNodeSocket *sock;
 	
@@ -305,7 +304,7 @@
 	}
 }
 
-void ntreeResolveOutputContexts(bNode *node)
+static void resolve_output_contexts(bNode *node)
 {
 	bNodeSocket *sock;
 	
@@ -352,21 +351,20 @@
 	}
 }
 
-void ntreeResolveSocketContexts(bNodeTree *ntree)
+static void resolve_socket_contexts_recursive(bNodeTree *ntree)
 {
 	bNode *node;
 	
 	/* nodes are assumed fully sorted, so context can be propagated from left to right */
 	for (node=ntree->nodes.first; node; node = node->next) {
-		ntreeResolveInputContexts(node);
+		resolve_input_contexts(node);
 		
 		if (node->type == NODE_GROUP && node->id)
-			ntreeResolveSocketContexts((bNodeTree*)node->id);
+			resolve_socket_contexts_recursive((bNodeTree*)node->id);
 		
-		ntreeResolveOutputContexts(node);
+		resolve_output_contexts(node);
 	}
 }
-#endif
 
 #if 0
 static void ntree_clear_tag_recursive(bNodeTree *ntree)
@@ -1025,7 +1023,7 @@
 	 * because the result on higher levels may differ from local level result.
 	 */
 	resolve_socket_types(ntree);
-//	ntreeResolveSocketContexts(ntree);
+	resolve_socket_contexts_recursive(ntree);
 
 	ntreeValidateLinks(ntree);