Revision: 19663
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19663
Author: vekoon
Date: 2009-04-11 17:55:07 +0200 (Sat, 11 Apr 2009)
Log Message:
-----------
sorry forgot a couple things
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c
2009-04-11 15:46:35 UTC (rev 19662)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c
2009-04-11 15:55:07 UTC (rev 19663)
@@ -2615,43 +2615,43 @@
if (len!=alen) {
err= -1;
fprintf(stderr, "%s.%s: for return parameter %s, was
expecting an array of %i elements, passed %i elements instead\n", tid, fid,
pid, len, alen);
- break;
}
-
- switch (type) {
- case PROP_BOOLEAN:
- case PROP_INT:
- case PROP_ENUM:
- {
- int *arg= va_arg(args, int*);
- err= rna_function_parameter_parse(&funcptr,
parm, type, ftype, len, arg, retdata, NULL, tid, fid, pid);
- break;
+ else {
+ switch (type) {
+ case PROP_BOOLEAN:
+ case PROP_INT:
+ case PROP_ENUM:
+ {
+ int *arg= va_arg(args, int*);
+ err=
rna_function_parameter_parse(&funcptr, parm, type, ftype, len, arg, retdata,
NULL, tid, fid, pid);
+ break;
+ }
+ case PROP_FLOAT:
+ {
+ float *arg= va_arg(args, float*);
+ err=
rna_function_parameter_parse(&funcptr, parm, type, ftype, len, arg, retdata,
NULL, tid, fid, pid);
+ break;
+ }
+ case PROP_STRING:
+ {
+ char **arg= va_arg(args, char**);
+ err=
rna_function_parameter_parse(&funcptr, parm, type, ftype, len, arg, retdata,
NULL, tid, fid, pid);
+ break;
+ }
+ case PROP_POINTER:
+ {
+ StructRNA *srna= va_arg(args,
StructRNA*);
+ void **arg= va_arg(args, void**);
+ err=
rna_function_parameter_parse(&funcptr, parm, type, ftype, len, arg, retdata,
srna, tid, fid, pid);
+ break;
+ }
+ default:
+ {
+ /* handle errors */
+ err=
rna_function_parameter_parse(&funcptr, parm, type, ftype, len, NULL, NULL,
NULL, tid, fid, pid);
+ break;
+ }
}
- case PROP_FLOAT:
- {
- float *arg= va_arg(args, float*);
- err= rna_function_parameter_parse(&funcptr,
parm, type, ftype, len, arg, retdata, NULL, tid, fid, pid);
- break;
- }
- case PROP_STRING:
- {
- char **arg= va_arg(args, char**);
- err= rna_function_parameter_parse(&funcptr,
parm, type, ftype, len, arg, retdata, NULL, tid, fid, pid);
- break;
- }
- case PROP_POINTER:
- {
- StructRNA *srna= va_arg(args, StructRNA*);
- void **arg= va_arg(args, void**);
- err= rna_function_parameter_parse(&funcptr,
parm, type, ftype, len, arg, retdata, srna, tid, fid, pid);
- break;
- }
- default:
- {
- /* handle errors */
- err= rna_function_parameter_parse(&funcptr,
parm, type, ftype, len, arg, NULL, NULL, tid, fid, pid);
- break;
- }
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
