diff options
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_action.c | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_animation.c | 8 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_fcurve.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_nla.c | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index f14e81a38df..2197764794b 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -2182,7 +2182,7 @@ bool RNA_property_animated(PointerRNA *ptr, PropertyRNA *prop) } for (index = 0; index < len; index++) { - if (rna_get_fcurve(ptr, prop, index, NULL, NULL, &driven, &special)) { + if (BKE_fcurve_find_by_rna(ptr, prop, index, NULL, NULL, &driven, &special)) { return true; } } diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index facbf8d59cc..e67366fc7ef 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -147,7 +147,7 @@ static FCurve *rna_Action_fcurve_find(bAction *act, } /* Returns NULL if not found. */ - return list_find_fcurve(&act->curves, data_path, index); + return BKE_fcurve_find(&act->curves, data_path, index); } static void rna_Action_fcurve_remove(bAction *act, ReportList *reports, PointerRNA *fcu_ptr) @@ -164,7 +164,7 @@ static void rna_Action_fcurve_remove(bAction *act, ReportList *reports, PointerR } action_groups_remove_channel(act, fcu); - free_fcurve(fcu); + BKE_fcurve_free(fcu); RNA_POINTER_INVALIDATE(fcu_ptr); } else { @@ -174,7 +174,7 @@ static void rna_Action_fcurve_remove(bAction *act, ReportList *reports, PointerR } BLI_remlink(&act->curves, fcu); - free_fcurve(fcu); + BKE_fcurve_free(fcu); RNA_POINTER_INVALIDATE(fcu_ptr); } diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 7ea44bce6db..823446a9d3b 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -648,7 +648,7 @@ static FCurve *rna_Driver_from_existing(AnimData *adt, bContext *C, FCurve *src_ } else { /* just make a copy of the existing one and add to self */ - FCurve *new_fcu = copy_fcurve(src_driver); + FCurve *new_fcu = BKE_fcurve_copy(src_driver); /* XXX: if we impose any ordering on these someday, this will be problematic */ BLI_addtail(&adt->drivers, new_fcu); @@ -664,7 +664,7 @@ static FCurve *rna_Driver_new( return NULL; } - if (list_find_fcurve(&adt->drivers, rna_path, array_index)) { + if (BKE_fcurve_find(&adt->drivers, rna_path, array_index)) { BKE_reportf(reports, RPT_ERROR, "Driver '%s[%d]' already exists", rna_path, array_index); return NULL; } @@ -683,7 +683,7 @@ static void rna_Driver_remove(AnimData *adt, Main *bmain, ReportList *reports, F BKE_report(reports, RPT_ERROR, "Driver not found in this animation data"); return; } - free_fcurve(fcu); + BKE_fcurve_free(fcu); DEG_relations_tag_update(bmain); } @@ -698,7 +698,7 @@ static FCurve *rna_Driver_find(AnimData *adt, } /* Returns NULL if not found. */ - return list_find_fcurve(&adt->drivers, data_path, index); + return BKE_fcurve_find(&adt->drivers, data_path, index); } bool rna_AnimaData_override_apply(Main *UNUSED(bmain), diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index 9fceafd8374..e49186f4cb1 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -579,7 +579,7 @@ static void rna_FCurve_group_set(PointerRNA *ptr, /* calculate time extents of F-Curve */ static void rna_FCurve_range(FCurve *fcu, float range[2]) { - calc_fcurve_range(fcu, range, range + 1, false, false); + BKE_fcurve_calc_range(fcu, range, range + 1, false, false); } static bool rna_FCurve_is_empty_get(PointerRNA *ptr) diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index 230d62d2a23..b0dda1237b0 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -382,7 +382,7 @@ static FCurve *rna_NlaStrip_fcurve_find(NlaStrip *strip, } /* Returns NULL if not found. */ - return list_find_fcurve(&strip->fcurves, data_path, index); + return BKE_fcurve_find(&strip->fcurves, data_path, index); } static NlaStrip *rna_NlaStrip_new(ID *id, |