[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36536] branches/particles-2010/source/ blender: Replaced the SOCK_VALUE socket type by SOCK_FLOAT.
Lukas Toenne
lukas.toenne at googlemail.com
Sat May 7 15:27:27 CEST 2011
Revision: 36536
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36536
Author: lukastoenne
Date: 2011-05-07 13:27:27 +0000 (Sat, 07 May 2011)
Log Message:
-----------
Replaced the SOCK_VALUE socket type by SOCK_FLOAT. These were using the same internal logic, but SOCK_VALUE was only kept for old nodes.
Modified Paths:
--------------
branches/particles-2010/source/blender/blenloader/intern/readfile.c
branches/particles-2010/source/blender/editors/space_node/drawnode.c
branches/particles-2010/source/blender/editors/space_node/node_draw.c
branches/particles-2010/source/blender/editors/space_node/node_edit.c
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_brightness.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_dilate.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_filter.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_idMask.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_math.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_normal.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_normalize.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_sepcombRGBA.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYUVA.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_setalpha.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_translate.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_value.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
branches/particles-2010/source/blender/nodes/intern/CMP_util.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_math.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_output.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_value.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodetree.c
branches/particles-2010/source/blender/nodes/intern/SHD_util.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_math.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
branches/particles-2010/source/blender/nodes/intern/TEX_util.c
branches/particles-2010/source/blender/nodes/intern/node_common.c
branches/particles-2010/source/blender/nodes/intern/node_exec.c
branches/particles-2010/source/blender/nodes/intern/node_socket.c
branches/particles-2010/source/blender/nodes/intern/node_socket.h
Modified: branches/particles-2010/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/particles-2010/source/blender/blenloader/intern/readfile.c 2011-05-07 13:01:48 UTC (rev 36535)
+++ branches/particles-2010/source/blender/blenloader/intern/readfile.c 2011-05-07 13:27:27 UTC (rev 36536)
@@ -6896,7 +6896,7 @@
bNodeSocketValueRGBA *valrgba;
switch (sock->type) {
- case SOCK_VALUE:
+ case SOCK_FLOAT:
valfloat = sock->default_value = MEM_callocN(sizeof(bNodeSocketValueFloat), "default socket value");
valfloat->value = sock->ns.vec[0];
valfloat->min = sock->ns.min;
Modified: branches/particles-2010/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/particles-2010/source/blender/editors/space_node/drawnode.c 2011-05-07 13:01:48 UTC (rev 36535)
+++ branches/particles-2010/source/blender/editors/space_node/drawnode.c 2011-05-07 13:27:27 UTC (rev 36536)
@@ -1977,7 +1977,6 @@
stype = ntreeGetSocketType(i);
if (stype) {
switch(stype->type) {
- case SOCK_VALUE:
case SOCK_FLOAT:
case SOCK_INT:
case SOCK_BOOLEAN:
Modified: branches/particles-2010/source/blender/editors/space_node/node_draw.c
===================================================================
--- branches/particles-2010/source/blender/editors/space_node/node_draw.c 2011-05-07 13:01:48 UTC (rev 36535)
+++ branches/particles-2010/source/blender/editors/space_node/node_draw.c 2011-05-07 13:27:27 UTC (rev 36536)
@@ -416,7 +416,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)
{
- static int types[]= { SOCK_VALUE, SOCK_VECTOR, SOCK_RGBA };
+ static int types[]= { SOCK_FLOAT, SOCK_VECTOR, SOCK_RGBA };
bNodeLink link= {NULL};
int i;
Modified: branches/particles-2010/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/particles-2010/source/blender/editors/space_node/node_edit.c 2011-05-07 13:01:48 UTC (rev 36535)
+++ branches/particles-2010/source/blender/editors/space_node/node_edit.c 2011-05-07 13:27:27 UTC (rev 36536)
@@ -899,7 +899,7 @@
SpaceNode *snode = CTX_wm_space_node(C);
int in_out= -1;
char name[32]= "";
- int type= SOCK_VALUE;
+ int type= SOCK_FLOAT;
bNodeTree *ngroup= snode->edittree;
bNodeSocket *sock;
@@ -942,7 +942,7 @@
RNA_def_enum(ot->srna, "in_out", socket_in_out_items, SOCK_IN, "Socket Type", "Input or Output");
RNA_def_string(ot->srna, "name", "", 32, "Name", "Group socket name");
- RNA_def_enum(ot->srna, "type", node_socket_type_items, SOCK_VALUE, "Type", "Type of the group socket");
+ RNA_def_enum(ot->srna, "type", node_socket_type_items, SOCK_FLOAT, "Type", "Type of the group socket");
}
/* ***************** Remove Group Socket operator ************* */
Modified: branches/particles-2010/source/blender/makesdna/DNA_node_types.h
===================================================================
--- branches/particles-2010/source/blender/makesdna/DNA_node_types.h 2011-05-07 13:01:48 UTC (rev 36535)
+++ branches/particles-2010/source/blender/makesdna/DNA_node_types.h 2011-05-07 13:27:27 UTC (rev 36536)
@@ -100,14 +100,13 @@
} bNodeSocket;
/* sock->type */
-#define SOCK_VALUE 0
+#define SOCK_FLOAT 0
#define SOCK_VECTOR 1
#define SOCK_RGBA 2
#define SOCK_INT 3
#define SOCK_BOOLEAN 4
-#define SOCK_FLOAT 5
-#define SOCK_MESH 6
-#define NUM_SOCKET_TYPES 7 /* must be last! */
+#define SOCK_MESH 5
+#define NUM_SOCKET_TYPES 6 /* must be last! */
/* socket side (input/output) */
#define SOCK_IN 1
Modified: branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c 2011-05-07 13:01:48 UTC (rev 36535)
+++ branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c 2011-05-07 13:27:27 UTC (rev 36536)
@@ -71,7 +71,7 @@
EnumPropertyItem node_socket_type_items[] = {
- {SOCK_VALUE, "VALUE", 0, "Value", ""},
+ {SOCK_FLOAT, "VALUE", 0, "Value", ""},
{SOCK_VECTOR, "VECTOR", 0, "Vector", ""},
{SOCK_RGBA, "RGBA", 0, "RGBA", ""},
{0, NULL, 0, NULL, NULL}};
@@ -224,7 +224,6 @@
}
switch (sock->type) {
- case SOCK_VALUE:
case SOCK_FLOAT:
NODE_DEFINE_SUBTYPES_FLOAT
break;
@@ -2851,7 +2850,7 @@
RNA_def_function_ui_description(func, "Add a socket to the group tree.");
RNA_def_function_flag(func, FUNC_USE_REPORTS);
RNA_def_string(func, "name", "Socket", 32, "Name", "Name of the socket");
- RNA_def_enum(func, "type", node_socket_type_items, SOCK_VALUE, "Type", "Type of socket");
+ RNA_def_enum(func, "type", node_socket_type_items, SOCK_FLOAT, "Type", "Type of socket");
/* return value */
parm= RNA_def_pointer(func, "socket", "NodeSocket", "", "New socket.");
RNA_def_function_return(func, parm);
Modified: branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c 2011-05-07 13:01:48 UTC (rev 36535)
+++ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c 2011-05-07 13:27:27 UTC (rev 36536)
@@ -36,7 +36,7 @@
/* **************** ALPHAOVER ******************** */
static bNodeSocketTemplate cmp_node_alphaover_in[]= {
- { SOCK_VALUE, 1, "Fac", 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, SOCK_SUBTYPE_FACTOR},
+ { SOCK_FLOAT, 1, "Fac", 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, SOCK_SUBTYPE_FACTOR},
{ SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f},
{ SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f},
{ -1, 0, "" }
Modified: branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_blur.c 2011-05-07 13:01:48 UTC (rev 36535)
+++ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_blur.c 2011-05-07 13:27:27 UTC (rev 36536)
@@ -38,7 +38,7 @@
/* **************** BLUR ******************** */
static bNodeSocketTemplate cmp_node_blur_in[]= {
{ SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f},
- { SOCK_VALUE, 1, "Size", 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, SOCK_SUBTYPE_FACTOR},
+ { SOCK_FLOAT, 1, "Size", 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, SOCK_SUBTYPE_FACTOR},
{ -1, 0, "" }
};
static bNodeSocketTemplate cmp_node_blur_out[]= {
Modified: branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_brightness.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_brightness.c 2011-05-07 13:01:48 UTC (rev 36535)
+++ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_brightness.c 2011-05-07 13:27:27 UTC (rev 36536)
@@ -40,8 +40,8 @@
static bNodeSocketTemplate cmp_node_brightcontrast_in[]= {
{ SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f},
- { SOCK_VALUE, 1, "Bright", 0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, SOCK_SUBTYPE_NONE},
- { SOCK_VALUE, 1, "Contrast", 0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, SOCK_SUBTYPE_NONE},
+ { SOCK_FLOAT, 1, "Bright", 0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, SOCK_SUBTYPE_NONE},
+ { SOCK_FLOAT, 1, "Contrast", 0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, SOCK_SUBTYPE_NONE},
{ -1, 0, "" }
};
static bNodeSocketTemplate cmp_node_brightcontrast_out[]= {
Modified: branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c 2011-05-07 13:01:48 UTC (rev 36535)
+++ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c 2011-05-07 13:27:27 UTC (rev 36536)
@@ -43,7 +43,7 @@
static bNodeSocketTemplate cmp_node_channel_matte_out[]={
{SOCK_RGBA,0,"Image"},
- {SOCK_VALUE,0,"Matte"},
+ {SOCK_FLOAT,0,"Matte"},
{-1,0,""}
};
Modified: branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c 2011-05-07 13:01:48 UTC (rev 36535)
+++ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c 2011-05-07 13:27:27 UTC (rev 36536)
@@ -43,7 +43,7 @@
static bNodeSocketTemplate cmp_node_chroma_out[]={
{SOCK_RGBA,0,"Image"},
- {SOCK_VALUE,0,"Matte"},
+ {SOCK_FLOAT,0,"Matte"},
{-1,0,""}
};
Modified: branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c 2011-05-07 13:01:48 UTC (rev 36535)
+++ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c 2011-05-07 13:27:27 UTC (rev 36536)
@@ -43,7 +43,7 @@
static bNodeSocketTemplate cmp_node_color_out[]={
{SOCK_RGBA,0,"Image"},
- {SOCK_VALUE,0,"Matte"},
+ {SOCK_FLOAT,0,"Matte"},
{-1,0,""}
};
Modified: branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c 2011-05-07 13:01:48 UTC (rev 36535)
+++ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c 2011-05-07 13:27:27 UTC (rev 36536)
@@ -40,7 +40,7 @@
/* ******************* Color Spill Supression ********************************* */
static bNodeSocketTemplate cmp_node_color_spill_in[]={
{SOCK_RGBA,1,"Image", 0.8f, 0.8f, 0.8f, 1.0f},
- {SOCK_VALUE, 1, "Fac", 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, SOCK_SUBTYPE_FACTOR},
+ {SOCK_FLOAT, 1, "Fac", 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, SOCK_SUBTYPE_FACTOR},
{-1,0,""}
};
Modified: branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list