diff options
Diffstat (limited to 'source/blender/makesrna/intern')
| -rw-r--r-- | source/blender/makesrna/intern/rna_animation.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_nla.c | 6 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_object_api.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 3d11e7bb723..3c940e3dcbf 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -520,7 +520,7 @@ static void rna_KeyingSet_paths_clear(KeyingSet *keyingset, ReportList *reports) /* needs wrapper function to push notifier */ static NlaTrack *rna_NlaTrack_new(AnimData *adt, bContext *C, NlaTrack *track) { - NlaTrack *new_track = add_nlatrack(adt, track); + NlaTrack *new_track = BKE_nlatrack_add(adt, track); WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_ADDED, NULL); @@ -536,7 +536,7 @@ static void rna_NlaTrack_remove(AnimData *adt, bContext *C, ReportList *reports, return; } - free_nlatrack(&adt->nla_tracks, track); + BKE_nlatrack_free(&adt->nla_tracks, track); RNA_POINTER_INVALIDATE(track_ptr); WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_REMOVED, NULL); diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index a14508ecb18..1301762a4bc 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -370,7 +370,7 @@ static FCurve *rna_NlaStrip_fcurve_find(NlaStrip *strip, ReportList *reports, co static NlaStrip *rna_NlaStrip_new(NlaTrack *track, bContext *C, ReportList *reports, const char *UNUSED(name), int start, bAction *action) { - NlaStrip *strip = add_nlastrip(action); + NlaStrip *strip = BKE_nlastrip_new(action); if (strip == NULL) { BKE_report(reports, RPT_ERROR, "Unable to create new strip"); @@ -383,7 +383,7 @@ static NlaStrip *rna_NlaStrip_new(NlaTrack *track, bContext *C, ReportList *repo if (BKE_nlastrips_add_strip(&track->strips, strip) == 0) { BKE_report(reports, RPT_ERROR, "Unable to add strip (the track does not have any space to accommodate this new strip)"); - free_nlastrip(NULL, strip); + BKE_nlastrip_free(NULL, strip); return NULL; } @@ -424,7 +424,7 @@ static void rna_NlaStrip_remove(NlaTrack *track, bContext *C, ReportList *report return; } - free_nlastrip(&track->strips, strip); + BKE_nlastrip_free(&track->strips, strip); RNA_POINTER_INVALIDATE(strip_ptr); WM_event_add_notifier(C, NC_ANIMATION | ND_NLA | NA_REMOVED, NULL); diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 17f19bfc38c..6b631ca0ecf 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -148,7 +148,7 @@ static int rna_Object_visible_get(Object *ob, bContext *C, ReportList *reports) } /* Convert a given matrix from a space to another (using the object and/or a bone as reference). */ -static void rna_Scene_mat_convert_space(Object *ob, ReportList *reports, bPoseChannel *pchan, +static void rna_Object_mat_convert_space(Object *ob, ReportList *reports, bPoseChannel *pchan, float *mat, float *mat_ret, int from, int to) { copy_m4_m4((float (*)[4])mat_ret, (float (*)[4])mat); @@ -585,7 +585,7 @@ void RNA_api_object(StructRNA *srna) RNA_def_function_return(func, parm); /* Matrix space conversion */ - func = RNA_def_function(srna, "convert_space", "rna_Scene_mat_convert_space"); + func = RNA_def_function(srna, "convert_space", "rna_Object_mat_convert_space"); RNA_def_function_ui_description(func, "Convert (transform) the given matrix from one space to another"); RNA_def_function_flag(func, FUNC_USE_REPORTS); parm = RNA_def_pointer(func, "pose_bone", "PoseBone", "", |