[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36537] branches/particles-2010/source/ blender: Removed unused converter callback functions from socket types.

Lukas Toenne lukas.toenne at googlemail.com
Sat May 7 15:36:30 CEST 2011


Revision: 36537
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36537
Author:   lukastoenne
Date:     2011-05-07 13:36:30 +0000 (Sat, 07 May 2011)
Log Message:
-----------
Removed unused converter callback functions from socket types. These will be implemented properly later.

Modified Paths:
--------------
    branches/particles-2010/source/blender/blenkernel/BKE_node.h
    branches/particles-2010/source/blender/nodes/intern/node_socket.c

Modified: branches/particles-2010/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/particles-2010/source/blender/blenkernel/BKE_node.h	2011-05-07 13:27:27 UTC (rev 36536)
+++ branches/particles-2010/source/blender/blenkernel/BKE_node.h	2011-05-07 13:36:30 UTC (rev 36537)
@@ -100,7 +100,6 @@
 typedef void (*NodeSocketButtonFunction)(const struct bContext *C, struct uiBlock *block, 
 										 struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *sock,
 										 const char *name, int x, int y, int width);
-typedef void (*NodeSocketConverterWalkFunction)(void *userdata, int type, const char *name);
 
 /** Defines a socket type.
  * Defines the appearance and behavior of a socket in the UI.
@@ -116,7 +115,6 @@
 	int value_structsize;
 	
 	NodeSocketButtonFunction buttonfunc;
-	void (*foreach_converter)(void *userdata, int type, NodeSocketConverterWalkFunction cb);
 } bNodeSocketType;
 
 /** Template for creating a node.

Modified: branches/particles-2010/source/blender/nodes/intern/node_socket.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/node_socket.c	2011-05-07 13:27:27 UTC (rev 36536)
+++ branches/particles-2010/source/blender/nodes/intern/node_socket.c	2011-05-07 13:36:30 UTC (rev 36537)
@@ -60,22 +60,10 @@
 	/* value_structsize */	sizeof(bNodeSocketValueFloat),
 
 	/* buttonfunc */		NULL,
-	/* convwalkfunc */		NULL
 };
 
 /****************** VECTOR ******************/
 
-static void foreach_converter_vector(void *userdata, int type, NodeSocketConverterWalkFunction cb)
-{
-	switch (type) {
-	case SOCK_FLOAT:
-		cb(userdata, SOCK_VECTOR_X, "X");
-		cb(userdata, SOCK_VECTOR_Y, "Y");
-		cb(userdata, SOCK_VECTOR_Z, "Z");
-		break;
-	}
-}
-
 static bNodeSocketType node_socket_type_vector = {
 	/* type */				SOCK_VECTOR,
 	/* ui_name */			"Vector",
@@ -87,23 +75,10 @@
 	/* value_structsize */	sizeof(bNodeSocketValueVector),
 
 	/* buttonfunc */		NULL,
-	/* foreach_converter */	foreach_converter_vector
 };
 
 /****************** RGBA ******************/
 
-static void foreach_converter_rgba(void *userdata, int type, NodeSocketConverterWalkFunction cb)
-{
-	switch (type) {
-	case SOCK_FLOAT:
-		cb(userdata, SOCK_RGBA_R, "R");
-		cb(userdata, SOCK_RGBA_G, "G");
-		cb(userdata, SOCK_RGBA_B, "B");
-		cb(userdata, SOCK_RGBA_A, "A");
-		break;
-	}
-}
-
 static bNodeSocketType node_socket_type_rgba = {
 	/* type */				SOCK_RGBA,
 	/* ui_name */			"RGBA",
@@ -115,7 +90,6 @@
 	/* value_structsize */	sizeof(bNodeSocketValueRGBA),
 
 	/* buttonfunc */		NULL,
-	/* foreach_converter */	foreach_converter_rgba
 };
 
 /****************** INT ******************/
@@ -131,7 +105,6 @@
 	/* value_structsize */	sizeof(bNodeSocketValueInt),
 
 	/* buttonfunc */		NULL,
-	/* convwalkfunc */		NULL
 };
 
 /****************** BOOLEAN ******************/
@@ -147,21 +120,10 @@
 	/* value_structsize */	sizeof(bNodeSocketValueBoolean),
 
 	/* buttonfunc */		NULL,
-	/* convwalkfunc */		NULL
 };
 
 /****************** MESH ******************/
 
-static void foreach_converter_mesh(void *userdata, int type, NodeSocketConverterWalkFunction cb)
-{
-	switch (type) {
-	case SOCK_VECTOR:
-		cb(userdata, SOCK_MESH_VERT_CO, "Vertex Position");
-		cb(userdata, SOCK_MESH_VERT_NO, "Vertex Normal");
-		break;
-	}
-}
-
 static bNodeSocketType node_socket_type_mesh = {
 	/* type */				SOCK_MESH,
 	/* ui_name */			"Mesh",
@@ -173,7 +135,6 @@
 	/* value_structsize */	0,
 
 	/* buttonfunc */		NULL,
-	/* foreach_converter */	foreach_converter_mesh
 };
 
 




More information about the Bf-blender-cvs mailing list