[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32425] branches/particles-2010/source/ blender: fixed a few compiler warnings, removed debug print

[Lukas Toenne]

Revision: 32425
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32425
Author:   lukastoenne
Date:     2010-10-12 08:37:57 +0200 (Tue, 12 Oct 2010)

Log Message:
-----------
fixed a few compiler warnings, removed debug print

Modified Paths:
--------------
    branches/particles-2010/source/blender/blenloader/intern/readfile.c
    branches/particles-2010/source/blender/makesdna/DNA_node_types.h
    branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_set_data.c

Modified: branches/particles-2010/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/particles-2010/source/blender/blenloader/intern/readfile.c	2010-10-12 03:23:44 UTC (rev 32424)
+++ branches/particles-2010/source/blender/blenloader/intern/readfile.c	2010-10-12 06:37:57 UTC (rev 32425)
@@ -2180,19 +2180,19 @@
 		node->lasty= 0;
 		for(sock= node->inputs.first; sock; sock= sock->next) {
 			sock->link= newdataadr(fd, sock->link);
-			sock->contexttype_name= newdataadr(fd, sock->contexttype_name);
+			sock->contexttype_name= newdataadr(fd, (void*)sock->contexttype_name);
 			sock->contexttype = RNA_find_struct(sock->contexttype_name);
 			if (sock->contexttype_name)
-				MEM_freeN(sock->contexttype_name);
+				MEM_freeN((void*)sock->contexttype_name);
 			sock->storage= newdataadr(fd, sock->storage);
 			sock->panel= newdataadr(fd, sock->panel);
 		}
 		for(sock= node->outputs.first; sock; sock= sock->next) {
 			sock->ns.data= NULL;
-			sock->contexttype_name= newdataadr(fd, sock->contexttype_name);
+			sock->contexttype_name= newdataadr(fd, (void*)sock->contexttype_name);
 			sock->contexttype = RNA_find_struct(sock->contexttype_name);
 			if (sock->contexttype_name)
-				MEM_freeN(sock->contexttype_name);
+				MEM_freeN((void*)sock->contexttype_name);
 			sock->storage= newdataadr(fd, sock->storage);
 			sock->panel= newdataadr(fd, sock->panel);
 		}

Modified: branches/particles-2010/source/blender/makesdna/DNA_node_types.h
===================================================================
--- branches/particles-2010/source/blender/makesdna/DNA_node_types.h	2010-10-12 03:23:44 UTC (rev 32424)
+++ branches/particles-2010/source/blender/makesdna/DNA_node_types.h	2010-10-12 06:37:57 UTC (rev 32425)
@@ -102,7 +102,7 @@
 	int own_index, to_index;	/* group socket identifiers, to find matching pairs after reading files */
 	
 	struct StructRNA *contexttype;	/* data context type (simulation nodes) */
-	char *contexttype_name;			/* temporary name string, only used during save/load! */
+	const char *contexttype_name;			/* temporary name string, only used during save/load! */
 	int island;					/* used during island calculation, for finding shared socket groups */
 	int pad2;
 	

Modified: branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_set_data.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_set_data.c	2010-10-12 03:23:44 UTC (rev 32424)
+++ branches/particles-2010/source/blender/nodes/intern/simulation/nodes/SIM_set_data.c	2010-10-12 06:37:57 UTC (rev 32425)
@@ -227,7 +227,6 @@
 				sim_input_read_vector(execdata, &sockiter, valvector);
 				RNA_property_float_set_array(&colliter.ptr, prop, valvector);
 				RNA_property_update_main(G.main, ctx->scene, &colliter.ptr, prop);
-				printf("--- setting vector %d: %f, %f, %f\n", sockiter.index, valvector[0], valvector[1], valvector[2]);
 				RNA_property_collection_next(&colliter);
 				sim_input_next(execdata, &sockiter);
 			}