[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18799] branches/blender2.5/blender/source /blender/makesrna/intern: RNA: some fixes for yesterdays commit, use of uninitialized
Brecht Van Lommel
brecht at blender.org
Tue Feb 3 11:14:44 CET 2009
Revision: 18799
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18799
Author: blendix
Date: 2009-02-03 11:14:29 +0100 (Tue, 03 Feb 2009)
Log Message:
-----------
RNA: some fixes for yesterdays commit, use of uninitialized
variables and errors in foreach macro.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_armature.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c 2009-02-03 09:34:42 UTC (rev 18798)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c 2009-02-03 10:14:29 UTC (rev 18799)
@@ -830,6 +830,12 @@
break;
}
case PROP_STRING: {
+ StringPropertyRNA *sprop= (StringPropertyRNA*)prop;
+
+ if(sprop->maxlength) {
+ fprintf(f, "#define %s_%s_MAX %d\n\n", srna->identifier, prop->identifier, sprop->maxlength);
+ }
+
fprintf(f, "void %sget(PointerRNA *ptr, char *value);\n", func);
fprintf(f, "int %slength(PointerRNA *ptr);\n", func);
//fprintf(f, "void %sset(PointerRNA *ptr, const char *value);\n", func);
@@ -1340,20 +1346,23 @@
PropertyDefRNA *dp;
StructRNA *srna;
- fprintf(f, "\n/* Automatically generated function declarations for the Data API.\n"
+ fprintf(f, "\n#ifndef __RNA_BLENDER_H__\n");
+ fprintf(f, "#define __RNA_BLENDER_H__\n\n");
+
+ fprintf(f, "/* Automatically generated function declarations for the Data API.\n"
" Do not edit manually, changes will be overwritten. */\n\n");
fprintf(f, "#include \"RNA_types.h\"\n\n");
- fprintf(f, "#define FOREACH_BEGIN(property, ptr, itemptr) \\\n");
+ fprintf(f, "#define FOREACH_BEGIN(property, sptr, itemptr) \\\n");
fprintf(f, " { \\\n");
- fprintf(f, " CollectionPropertyIterator itemptr##_macro_iter; \\\n");
- fprintf(f, " for(property##_begin(sptr, propname, &itemptr##_macro_iter); itemptr##_macro_iter.valid; property##_end(&itemptr##_macro_iter)) { \\\n");
- fprintf(f, " PointerRNA itemptr= itemptr##_macro_iter.ptr;\n\n");
+ fprintf(f, " CollectionPropertyIterator rna_macro_iter; \\\n");
+ fprintf(f, " for(property##_begin(&rna_macro_iter, sptr); rna_macro_iter.valid; property##_next(&rna_macro_iter)) { \\\n");
+ fprintf(f, " itemptr= rna_macro_iter.ptr;\n\n");
- fprintf(f, "#define FOREACH_END \\\n");
+ fprintf(f, "#define FOREACH_END(property) \\\n");
fprintf(f, " } \\\n");
- fprintf(f, " property##__end(&itemptr##_macro_iter); \\\n");
+ fprintf(f, " property##_end(&rna_macro_iter); \\\n");
fprintf(f, " }\n\n");
for(ds=DefRNA.structs.first; ds; ds=ds->next) {
@@ -1370,6 +1379,8 @@
for(dp=ds->properties.first; dp; dp=dp->next)
rna_def_property_funcs_header(f, dp);
}
+
+ fprintf(f, "#endif /* __RNA_BLENDER_H__ */\n");
}
static void make_bad_file(char *file)
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c 2009-02-03 09:34:42 UTC (rev 18798)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c 2009-02-03 10:14:29 UTC (rev 18799)
@@ -57,6 +57,7 @@
return 0;
}
+#if 0
static void rna_Driver_RnaPath_set(PointerRNA *ptr, const char *value)
{
ChannelDriver *driver= (ChannelDriver *)ptr->data;
@@ -69,8 +70,8 @@
else
driver->rna_path= NULL;
}
+#endif
-
static void rna_FCurve_RnaPath_get(PointerRNA *ptr, char *value)
{
FCurve *fcu= (FCurve *)ptr->data;
@@ -91,6 +92,7 @@
return 0;
}
+#if 0
static void rna_FCurve_RnaPath_set(PointerRNA *ptr, const char *value)
{
FCurve *fcu= (FCurve *)ptr->data;
@@ -103,6 +105,7 @@
else
fcu->rna_path= NULL;
}
+#endif
#else
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_armature.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_armature.c 2009-02-03 09:34:42 UTC (rev 18798)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_armature.c 2009-02-03 10:14:29 UTC (rev 18799)
@@ -37,7 +37,7 @@
static void rna_Bone_layer_set(PointerRNA *ptr, const int *values)
{
Bone *bone= (Bone*)ptr->data;
- int i, tot;
+ int i, tot= 0;
/* ensure we always have some layer selected */
for(i=0; i<20; i++)
@@ -56,7 +56,7 @@
static void rna_Armature_layer_set(PointerRNA *ptr, const int *values)
{
bArmature *arm= (bArmature*)ptr->data;
- int i, tot;
+ int i, tot= 0;
/* ensure we always have some layer selected */
for(i=0; i<20; i++)
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c 2009-02-03 09:34:42 UTC (rev 18798)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c 2009-02-03 10:14:29 UTC (rev 18799)
@@ -204,7 +204,7 @@
static void rna_Object_layer_set(PointerRNA *ptr, const int *values)
{
Object *ob= (Object*)ptr->data;
- int i, tot;
+ int i, tot= 0;
/* ensure we always have some layer selected */
for(i=0; i<20; i++)
@@ -223,7 +223,7 @@
static void rna_GameObjectSettings_state_set(PointerRNA *ptr, const int *values)
{
Object *ob= (Object*)ptr->data;
- int i, tot;
+ int i, tot= 0;
/* ensure we always have some stateer selected */
for(i=0; i<20; i++)
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c 2009-02-03 09:34:42 UTC (rev 18798)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c 2009-02-03 10:14:29 UTC (rev 18799)
@@ -49,7 +49,7 @@
static void rna_Scene_layer_set(PointerRNA *ptr, const int *values)
{
Scene *scene= (Scene*)ptr->data;
- int i, tot;
+ int i, tot= 0;
/* ensure we always have some layer selected */
for(i=0; i<20; i++)
More information about the Bf-blender-cvs
mailing list