[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33337] branches/particles-2010/source/ blender: Small bugfix for type selection box for custom properties.

[Lukas Toenne]

Revision: 33337
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33337
Author:   lukastoenne
Date:     2010-11-26 17:48:10 +0100 (Fri, 26 Nov 2010)

Log Message:
-----------
Small bugfix for type selection box for custom properties. Explicit case of pointer arguments to avoid warning.

Modified Paths:
--------------
    branches/particles-2010/source/blender/editors/space_node/drawnode.c
    branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_get_data.c
    branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_set_data.c

Modified: branches/particles-2010/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/particles-2010/source/blender/editors/space_node/drawnode.c	2010-11-26 16:33:42 UTC (rev 33336)
+++ branches/particles-2010/source/blender/editors/space_node/drawnode.c	2010-11-26 16:48:10 UTC (rev 33337)
@@ -1335,7 +1335,7 @@
 	case SIM_NODE_SETDATA:	sim_setdata_property_types(sock, &types, &num_types);	break;
 	}
 	
-	uiLayoutSetFunc(layout, do_property_socket_type, sock);
+	uiLayoutSetFunc(layout, do_property_socket_type, arg);
 	
 	for (i=0; i < num_types; ++i) {
 		ntreeSocketTypeInfo(types[i], NULL, &icon, &name);

Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_get_data.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_get_data.c	2010-11-26 16:33:42 UTC (rev 33336)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_get_data.c	2010-11-26 16:48:10 UTC (rev 33337)
@@ -114,7 +114,7 @@
 			if (!rna_property_valid(node, prop))
 				continue;
 			
-			if (!cb(items, str, RNA_property_ui_name(prop), RNA_property_ui_name(prop), RNA_property_ui_icon(prop)))
+			if (!cb(items, str, RNA_property_ui_name(prop), (void*)RNA_property_ui_name(prop), RNA_property_ui_icon(prop)))
 				break;
 		}
 	}

Modified: branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_set_data.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_set_data.c	2010-11-26 16:33:42 UTC (rev 33336)
+++ branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_set_data.c	2010-11-26 16:48:10 UTC (rev 33337)
@@ -110,7 +110,7 @@
 			if (!rna_property_valid(node, prop))
 				continue;
 			
-			if (!cb(items, str, RNA_property_ui_name(prop), RNA_property_ui_name(prop), RNA_property_ui_icon(prop)))
+			if (!cb(items, str, RNA_property_ui_name(prop), (void*)RNA_property_ui_name(prop), RNA_property_ui_icon(prop)))
 				break;
 		}
 	}