Fix T47233: fcurves.find() won't work with drivers
authorJoshua Leung <aligorith@gmail.com>
Mon, 25 Jan 2016 11:11:10 +0000 (00:11 +1300)
committerJoshua Leung <aligorith@gmail.com>
Mon, 25 Jan 2016 11:11:56 +0000 (00:11 +1300)
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.

source/blender/makesrna/intern/rna_animation.c

index 8502c1d068638d25308e1adf0751d2bc824bf997..c3d1070b8c2b43cb9e48614de749bc2a979d1a80 100644 (file)
@@ -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)