diff options
author | Joshua Leung <aligorith@gmail.com> | 2016-01-25 14:11:10 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2016-01-25 14:11:56 +0300 |
commit | 45fd0847f459d011cd06e0c3975e463cac39fb19 (patch) | |
tree | cf2fb2879c0eb7e9d8fdf28f947c5b236469598a /source/blender/makesrna/intern/rna_animation.c | |
parent | 064903f8ed7e7d52e4a6fc6dad42538b52f15efb (diff) |
Fix T47233: fcurves.find() won't work with drivers
Doing something like:
bpy.data.objects["Cube.001"].data.shape_keys.animation_data.drivers.find('eval_time')
wouldn't work, because the drivers.find(datapath, index) method wasn't implemented
yet. Previously, it was only implemented for FCurves in actions.
Diffstat (limited to 'source/blender/makesrna/intern/rna_animation.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_animation.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 8502c1d0686..c3d1070b8c2 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -552,6 +552,17 @@ static FCurve *rna_Driver_from_existing(AnimData *adt, bContext *C, FCurve *src_ } } +static FCurve *rna_Driver_find(AnimData *adt, ReportList *reports, const char *data_path, int index) +{ + if (data_path[0] == '\0') { + BKE_report(reports, RPT_ERROR, "F-Curve data path empty, invalid argument"); + return NULL; + } + + /* Returns NULL if not found. */ + return list_find_fcurve(&adt->drivers, data_path, index); +} + #else /* helper function for Keying Set -> keying settings */ @@ -936,6 +947,7 @@ static void rna_api_animdata_drivers(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_struct_sdna(srna, "AnimData"); RNA_def_struct_ui_text(srna, "Drivers", "Collection of Driver F-Curves"); + /* AnimData.drivers.from_existing(...) */ func = RNA_def_function(srna, "from_existing", "rna_Driver_from_existing"); RNA_def_function_flag(func, FUNC_USE_CONTEXT); RNA_def_function_ui_description(func, "Add a new driver given an existing one"); @@ -943,6 +955,18 @@ static void rna_api_animdata_drivers(BlenderRNA *brna, PropertyRNA *cprop) /* return type */ parm = RNA_def_pointer(func, "driver", "FCurve", "", "New Driver F-Curve"); RNA_def_function_return(func, parm); + + /* AnimData.drivers.find(...) */ + func = RNA_def_function(srna, "find", "rna_Driver_find"); + RNA_def_function_ui_description(func, "Find a driver F-Curve. Note that this function performs a linear scan " + "of all driver F-Curves."); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + parm = RNA_def_string(func, "data_path", NULL, 0, "Data Path", "F-Curve data path"); + RNA_def_property_flag(parm, PROP_REQUIRED); + RNA_def_int(func, "index", 0, 0, INT_MAX, "Index", "Array index", 0, INT_MAX); + /* return type */ + parm = RNA_def_pointer(func, "fcurve", "FCurve", "", "The found F-Curve, or None if it doesn't exist"); + RNA_def_function_return(func, parm); } void rna_def_animdata_common(StructRNA *srna) |