[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36593] branches/particles-2010/source/ blender: Replaced the DNA socket subtype values by RNA PropertySubType values again .
Lukas Toenne
lukas.toenne at googlemail.com
Tue May 10 13:19:27 CEST 2011
Revision: 36593
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36593
Author: lukastoenne
Date: 2011-05-10 11:19:26 +0000 (Tue, 10 May 2011)
Log Message:
-----------
Replaced the DNA socket subtype values by RNA PropertySubType values again. The DNA defines were added because writing RNA enums to files is not secure if those values change. However, keeping the new DNA definitions in sync is also error prone, so just added warning in RNA_types.h to not change the subtype values because of this.
Modified Paths:
--------------
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
branches/particles-2010/source/blender/makesrna/RNA_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_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_dilate.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_displace.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_invert.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.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_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/SHD_nodes/SHD_curves.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_mapping.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_vectMath.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_at.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_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_output.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_scale.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_translate.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
Modified: branches/particles-2010/source/blender/makesdna/DNA_node_types.h
===================================================================
--- branches/particles-2010/source/blender/makesdna/DNA_node_types.h 2011-05-10 05:20:18 UTC (rev 36592)
+++ branches/particles-2010/source/blender/makesdna/DNA_node_types.h 2011-05-10 11:19:26 UTC (rev 36593)
@@ -293,27 +293,7 @@
float value[4];
} bNodeSocketValueRGBA;
-/* Socket value subtypes.
- * Make sure these use the same suffix as their RNA counterparts,
- * so the RNA definitions macros can match the subtype definitions.
- * When adding a new subtype here, make sure you also add it
- * to the NODE_DEFINE_SUBTYPES macro in node_socket.h.
- */
-#define SOCK_SUBTYPE_NONE 0
-#define SOCK_SUBTYPE_UNSIGNED 1
-#define SOCK_SUBTYPE_PERCENTAGE 2
-#define SOCK_SUBTYPE_FACTOR 3
-#define SOCK_SUBTYPE_ANGLE 4
-#define SOCK_SUBTYPE_TIME 5
-#define SOCK_SUBTYPE_DISTANCE 6
-#define SOCK_SUBTYPE_TRANSLATION 7
-#define SOCK_SUBTYPE_DIRECTION 8
-#define SOCK_SUBTYPE_VELOCITY 9
-#define SOCK_SUBTYPE_ACCELERATION 10
-#define SOCK_SUBTYPE_EULER 11
-#define SOCK_SUBTYPE_XYZ 12
-
/* data structs, for node->storage */
/* this one has been replaced with ImageUser, keep it for do_versions() */
Modified: branches/particles-2010/source/blender/makesrna/RNA_types.h
===================================================================
--- branches/particles-2010/source/blender/makesrna/RNA_types.h 2011-05-10 05:20:18 UTC (rev 36592)
+++ branches/particles-2010/source/blender/makesrna/RNA_types.h 2011-05-10 11:19:26 UTC (rev 36593)
@@ -97,7 +97,10 @@
#define RNA_ENUM_BITFLAG_SIZE 32
-/* also update enums in bpy_props.c when adding items here */
+/* also update enums in bpy_props.c when adding items here
+ * watch it: these values are written to files as part of
+ * node socket button subtypes!
+ */
typedef enum PropertySubType {
PROP_NONE = 0,
Modified: branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c 2011-05-10 05:20:18 UTC (rev 36592)
+++ branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c 2011-05-10 11:19:26 UTC (rev 36593)
@@ -214,7 +214,7 @@
#define SUBTYPE(socktype, stypename, id, idname) \
{ \
bNodeSocketValue##stypename *value= (bNodeSocketValue##stypename*)sock->default_value; \
- if (value->subtype==SOCK_SUBTYPE_##id) \
+ if (value->subtype==PROP_##id) \
return &RNA_NodeSocket##stypename##idname; \
}
@@ -2670,14 +2670,14 @@
PropertyRNA *prop=NULL;
PropertySubType propsubtype= PROP_NONE;
- #define SUBTYPE(socktype, stypename, id, idname) { SOCK_SUBTYPE_##id, #id, 0, #idname, ""},
+ #define SUBTYPE(socktype, stypename, id, idname) { PROP_##id, #id, 0, #idname, ""},
static EnumPropertyItem subtype_items[] = {
NODE_DEFINE_SUBTYPES
{0, NULL, 0, NULL, NULL}
};
#undef SUBTYPE
- #define SUBTYPE(socktype, stypename, id, idname) if (subtype==SOCK_SUBTYPE_##id) propsubtype = PROP_##id;
+ #define SUBTYPE(socktype, stypename, id, idname) if (subtype==PROP_##id) propsubtype = PROP_##id;
NODE_DEFINE_SUBTYPES
#undef SUBTYPE
@@ -2982,7 +2982,7 @@
/* Generate RNA definitions for all socket subtypes */
#define SUBTYPE(socktype, stypename, id, idname) \
- rna_def_node_socket_subtype(brna, SOCK_##socktype, SOCK_SUBTYPE_##id, "NodeSocket"#stypename#idname, #idname" "#stypename" Node Socket");
+ rna_def_node_socket_subtype(brna, SOCK_##socktype, PROP_##id, "NodeSocket"#stypename#idname, #idname" "#stypename" Node Socket");
NODE_DEFINE_SUBTYPES
#undef SUBTYPE
rna_def_node_socket_subtype(brna, SOCK_BOOLEAN, 0, "NodeSocketBoolean", "Boolean Node Socket");
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-10 05:20:18 UTC (rev 36592)
+++ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c 2011-05-10 11:19:26 UTC (rev 36593)
@@ -36,7 +36,7 @@
/* **************** ALPHAOVER ******************** */
static bNodeSocketTemplate cmp_node_alphaover_in[]= {
- { SOCK_FLOAT, 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, PROP_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-10 05:20:18 UTC (rev 36592)
+++ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_blur.c 2011-05-10 11:19:26 UTC (rev 36593)
@@ -38,7 +38,7 @@
/* **************** BLUR ******************** */
static bNodeSocketTemplate cmp_node_blur_in[]= {
{ SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f},
- { SOCK_FLOAT, 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, PROP_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-10 05:20:18 UTC (rev 36592)
+++ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_brightness.c 2011-05-10 11:19:26 UTC (rev 36593)
@@ -40,8 +40,8 @@
static bNodeSocketTemplate cmp_node_brightcontrast_in[]= {
{ SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f},
- { 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},
+ { SOCK_FLOAT, 1, "Bright", 0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE},
+ { SOCK_FLOAT, 1, "Contrast", 0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE},
{ -1, 0, "" }
};
static bNodeSocketTemplate cmp_node_brightcontrast_out[]= {
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-10 05:20:18 UTC (rev 36592)
+++ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c 2011-05-10 11:19:26 UTC (rev 36593)
@@ -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_FLOAT, 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, PROP_FACTOR},
{-1,0,""}
};
Modified: branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c 2011-05-10 05:20:18 UTC (rev 36592)
+++ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c 2011-05-10 11:19:26 UTC (rev 36593)
@@ -38,7 +38,7 @@
/* ******************* Color Balance ********************************* */
static bNodeSocketTemplate cmp_node_colorbalance_in[]={
- {SOCK_FLOAT, 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, PROP_FACTOR},
{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_composite.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_composite.c 2011-05-10 05:20:18 UTC (rev 36592)
+++ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_composite.c 2011-05-10 11:19:26 UTC (rev 36593)
@@ -39,8 +39,8 @@
/* **************** COMPOSITE ******************** */
static bNodeSocketTemplate cmp_node_composite_in[]= {
{ SOCK_RGBA, 1, "Image", 0.0f, 0.0f, 0.0f, 1.0f},
- { SOCK_FLOAT, 1, "Alpha", 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, SOCK_SUBTYPE_FACTOR},
- { SOCK_FLOAT, 1, "Z", 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, SOCK_SUBTYPE_FACTOR},
+ { SOCK_FLOAT, 1, "Alpha", 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+ { SOCK_FLOAT, 1, "Z", 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
{ -1, 0, "" }
};
Modified: branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_curves.c 2011-05-10 05:20:18 UTC (rev 36592)
+++ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_curves.c 2011-05-10 11:19:26 UTC (rev 36593)
@@ -83,7 +83,7 @@
/* **************** CURVE VEC ******************** */
static bNodeSocketTemplate cmp_node_curve_vec_in[]= {
- { SOCK_VECTOR, 1, "Vector", 0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, SOCK_SUBTYPE_NONE},
+ { SOCK_VECTOR, 1, "Vector", 0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE},
{ -1, 0, "" }
};
@@ -122,7 +122,7 @@
/* **************** CURVE RGB ******************** */
static bNodeSocketTemplate cmp_node_curve_rgb_in[]= {
- { SOCK_FLOAT, 1, "Fac", 1.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, SOCK_SUBTYPE_FACTOR},
+ { SOCK_FLOAT, 1, "Fac", 1.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_FACTOR},
{ SOCK_RGBA, 1, "Image", 0.0f, 0.0f, 0.0f, 1.0f},
{ SOCK_RGBA, 1, "Black Level", 0.0f, 0.0f, 0.0f, 1.0f},
{ SOCK_RGBA, 1, "White Level", 1.0f, 1.0f, 1.0f, 1.0f},
Modified: branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c 2011-05-10 05:20:18 UTC (rev 36592)
+++ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c 2011-05-10 11:19:26 UTC (rev 36593)
@@ -37,7 +37,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list