[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29709] branches/particles-2010/source/ blender: Renamed SOCK_EXEC socket type to SOCK_OP to better reflect that what is actually copied between nodes is an operator .

[Lukas Tönne]

Revision: 29709
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29709
Author:   lukastoenne
Date:     2010-06-26 16:12:28 +0200 (Sat, 26 Jun 2010)

Log Message:
-----------
Renamed SOCK_EXEC socket type to SOCK_OP to better reflect that what is actually copied between nodes is an operator.

Modified Paths:
--------------
    branches/particles-2010/source/blender/blenkernel/intern/node.c
    branches/particles-2010/source/blender/editors/space_node/node_draw.c
    branches/particles-2010/source/blender/makesdna/DNA_node_types.h

Modified: branches/particles-2010/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/particles-2010/source/blender/blenkernel/intern/node.c	2010-06-26 13:39:43 UTC (rev 29708)
+++ branches/particles-2010/source/blender/blenkernel/intern/node.c	2010-06-26 14:12:28 UTC (rev 29709)
@@ -147,8 +147,8 @@
 
 int nodeIsListSocket(bNodeSocketType *stype)
 {
-	/* TODO needs a more generic way of allowing list sockets */
-	return (stype->type == SOCK_EXEC);
+	/* TODO needs a more generic way of allowing list sockets - phonybone */
+	return (stype->type == SOCK_OP);
 }
 
 /* only used internal... we depend on type definitions! */
@@ -1255,7 +1255,7 @@
 		int totype = link->tosock->type;
 		if (ELEM3(fromtype, SOCK_VALUE, SOCK_RGBA, SOCK_VECTOR) && ELEM3(totype, SOCK_VALUE, SOCK_RGBA, SOCK_VECTOR)) {
 			valid = 1;
-		} else if (fromtype == SOCK_EXEC && totype == SOCK_EXEC) {
+		} else if (fromtype == SOCK_OP && totype == SOCK_OP) {
 			valid = 1;
 		} else if (fromtype == SOCK_ID && totype == SOCK_ID) {
 			/* TODO check ID data type match! */

Modified: branches/particles-2010/source/blender/editors/space_node/node_draw.c
===================================================================
--- branches/particles-2010/source/blender/editors/space_node/node_draw.c	2010-06-26 13:39:43 UTC (rev 29708)
+++ branches/particles-2010/source/blender/editors/space_node/node_draw.c	2010-06-26 14:12:28 UTC (rev 29709)
@@ -446,7 +446,7 @@
 /* note: in cmp_util.c is similar code, for node_compo_pass_on() */
 static void node_draw_mute_line(View2D *v2d, SpaceNode *snode, bNode *node)
 {
-	bNodeSocket *valsock= NULL, *colsock= NULL, *vecsock= NULL, *execsock= NULL, *idsock= NULL;
+	bNodeSocket *valsock= NULL, *colsock= NULL, *vecsock= NULL, *opsock= NULL, *idsock= NULL;
 	bNodeSocket *sock;
 	bNodeLink link;
 	int a;
@@ -462,7 +462,7 @@
 			if(sock->type==SOCK_VALUE && valsock==NULL) valsock= sock;
 			if(sock->type==SOCK_VECTOR && vecsock==NULL) vecsock= sock;
 			if(sock->type==SOCK_RGBA && colsock==NULL) colsock= sock;
-			if(sock->type==SOCK_EXEC && execsock==NULL) execsock= sock;
+			if(sock->type==SOCK_OP && opsock==NULL) opsock= sock;
 			if(sock->type==SOCK_ID && idsock==NULL) idsock= sock;
 		}
 	}
@@ -492,13 +492,13 @@
 					node_draw_link_bezier(v2d, snode, &link, TH_WIRE, TH_WIRE, 0);
 					colsock= NULL;
 				}
-				if(sock->type==SOCK_EXEC && execsock) {
-					link.fromsock= execsock;
+				if(sock->type==SOCK_OP && opsock) {
+					link.fromsock= opsock;
 					node_draw_link_bezier(v2d, snode, &link, TH_WIRE, TH_WIRE, 0);
-					execsock= NULL;
+					opsock= NULL;
 				}
 				if(sock->type==SOCK_ID && idsock) {
-					link.fromsock= execsock;
+					link.fromsock= opsock;
 					node_draw_link_bezier(v2d, snode, &link, TH_WIRE, TH_WIRE, 0);
 					idsock= NULL;
 				}
@@ -563,7 +563,7 @@
 	else if(sock->type==SOCK_RGBA) {
 		col[0]= 200; col[1]= 200; col[2]= 40;
 	}
-	else if(sock->type==SOCK_EXEC) {
+	else if(sock->type==SOCK_OP) {
 		if (sock->link == NULL) {
 			col[0]= 120; col[1]= 90; col[2]= 30;
 		} else {
@@ -829,7 +829,7 @@
 										   (short)(sock->locx+NODE_DYS) + 40, (short)sock->locy-8, labelw, 15, 
 										   NULL, 0, 0, 0, 0, "");
 				}
-				else if(sock->type==SOCK_EXEC) {
+				else if(sock->type==SOCK_OP) {
 					uiDefBut(node->block, LABEL, 0, sock->name, (short)(sock->locx+7), (short)(sock->locy-9.0f), 
 							 (short)(node->width-NODE_DY), NODE_DY,  NULL, 0, 0, 0, 0, "");
 				}

Modified: branches/particles-2010/source/blender/makesdna/DNA_node_types.h
===================================================================
--- branches/particles-2010/source/blender/makesdna/DNA_node_types.h	2010-06-26 13:39:43 UTC (rev 29708)
+++ branches/particles-2010/source/blender/makesdna/DNA_node_types.h	2010-06-26 14:12:28 UTC (rev 29709)
@@ -89,7 +89,7 @@
 #define SOCK_VALUE		0
 #define SOCK_VECTOR		1
 #define SOCK_RGBA		2
-#define SOCK_EXEC		3
+#define SOCK_OP			3
 #define SOCK_ID			4
 
 /* sock->flag, first bit is select */