[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33313] branches/particles-2010/source/ blender/nodes/intern: * Some debug prints removed.

[Lukas Toenne]

Revision: 33313
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33313
Author:   lukastoenne
Date:     2010-11-25 17:42:32 +0100 (Thu, 25 Nov 2010)

Log Message:
-----------
* Some debug prints removed.
* "For" node operator storage correctly freed.

Modified Paths:
--------------
    branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_for.c
    branches/particles-2010/source/blender/nodes/intern/SIM_nodetree.c
    branches/particles-2010/source/blender/nodes/intern/SIM_util.c

Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_for.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_for.c	2010-11-25 16:00:06 UTC (rev 33312)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_for.c	2010-11-25 16:42:32 UTC (rev 33313)
@@ -63,6 +63,9 @@
 	
 	if (execlevel < storage->iterations)
 		*pushop = 1;
+	else {
+		MEM_freeN(storage);
+	}
 }
 
 void nodeRegisterSimFor(ListBase *typelist)

Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodetree.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodetree.c	2010-11-25 16:00:06 UTC (rev 33312)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodetree.c	2010-11-25 16:42:32 UTC (rev 33313)
@@ -720,9 +720,6 @@
 	apply_socket_restypes(ntree);
 	
 	for(node= ntree->nodes.first; node; node= node->next) {
-		if (node->type == SIM_NODE_FOR) {
-			printf("blabla\n");
-		}
 		if (node->type != NODE_GROUP) {
 			nodestack[n].base = node;
 			nodestack[n].id = n;
@@ -1191,7 +1188,7 @@
 		
 		/* repeatedly execute branches until no more operator is active */
 		while (op) {
-			printf("Executing operator subtree %s\n", op->node->base->name);
+//			printf("Executing operator subtree %s\n", op->node->base->name);
 			
 			/* clear tags */
 			for (ns=execdata->nodestack, n=0; n < execdata->totnode; ++ns, ++n) {

Modified: branches/particles-2010/source/blender/nodes/intern/SIM_util.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_util.c	2010-11-25 16:00:06 UTC (rev 33312)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_util.c	2010-11-25 16:42:32 UTC (rev 33313)
@@ -433,6 +433,8 @@
 			return sizeof(SurfacePoint);
 		case SOCK_OP:
 			return 0;
+		case SOCK_ANY:
+			return 0;
 		default:
 			printf("ERROR: socket datatype %d size not defined!\n", datatype);
 			return 0;