diff options
author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-09-11 22:09:58 +0400 |
---|---|---|
committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-09-11 22:09:58 +0400 |
commit | 3b2ad838e8c628a468ee19ac77fb1336dd6072cf (patch) | |
tree | bc1e229f3055e4114086775122c7a47facb42679 /source/blender/makesrna/intern/rna_action_api.c | |
parent | 7220792f187f91a2ef3eb0c930a13674b2a8a80a (diff) | |
parent | 15d77f17a40398a63f95e16607deb81257c02698 (diff) |
Merge with -r 22620:23107.
Next: update scripts and merge in 2.5.
Diffstat (limited to 'source/blender/makesrna/intern/rna_action_api.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_action_api.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_action_api.c b/source/blender/makesrna/intern/rna_action_api.c index 11efa6d5f8a..35c6c921104 100644 --- a/source/blender/makesrna/intern/rna_action_api.c +++ b/source/blender/makesrna/intern/rna_action_api.c @@ -1,4 +1,6 @@ /** + * $Id$ + * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -41,6 +43,8 @@ #include "DNA_anim_types.h" #include "DNA_curve_types.h" +/* TODO bring back once array return types are allowed */ +#if 0 /* return frame range of all curves (min, max) or (0, 1) if there are no keys */ int *rna_Action_get_frame_range(bAction *act, int *ret_length) { @@ -57,6 +61,7 @@ int *rna_Action_get_frame_range(bAction *act, int *ret_length) return ret; } +#endif #else @@ -65,11 +70,13 @@ void RNA_api_action(StructRNA *srna) FunctionRNA *func; PropertyRNA *parm; +#if 0 func= RNA_def_function(srna, "get_frame_range", "rna_Action_get_frame_range"); RNA_def_function_ui_description(func, "Get action frame range as a (min, max) tuple."); parm= RNA_def_int_array(func, "frame_range", 1, NULL, 0, 0, "", "Action frame range.", 0, 0); - RNA_def_property_flag(parm, PROP_DYNAMIC_ARRAY); + RNA_def_property_flag(parm, PROP_DYNAMIC); RNA_def_function_return(func, parm); +#endif } #endif |