1 files changed, 13 insertions, 13 deletions

diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c
index c74b5569857..85dee2617d8 100644
--- a/source/blender/makesrna/intern/rna_tracking.c
+++ b/source/blender/makesrna/intern/rna_tracking.c
@@ -126,7 +126,7 @@ static void rna_tracking_active_object_index_range(PointerRNA *ptr, int *min, in
 static PointerRNA rna_tracking_active_track_get(PointerRNA *ptr)
 {
 	MovieClip *clip = (MovieClip *)ptr->id.data;
-	MovieTrackingTrack *act_track = BKE_tracking_active_track(&clip->tracking);
+	MovieTrackingTrack *act_track = BKE_tracking_track_get_active(&clip->tracking);
 
 	return rna_pointer_inherit_refine(ptr, &RNA_MovieTrackingTrack, act_track);
 }
@@ -135,7 +135,7 @@ static void rna_tracking_active_track_set(PointerRNA *ptr, PointerRNA value)
 {
 	MovieClip *clip = (MovieClip *)ptr->id.data;
 	MovieTrackingTrack *track = (MovieTrackingTrack *)value.data;
-	ListBase *tracksbase = BKE_tracking_get_tracks(&clip->tracking);
+	ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking);
 	int index = BLI_findindex(tracksbase, track);
 
 	if (index >= 0)
@@ -169,7 +169,7 @@ void rna_trackingTrack_name_set(PointerRNA *ptr, const char *value)
 		}
 	}
 
-	BKE_track_unique_name(tracksbase, track);
+	BKE_tracking_track_unique_name(tracksbase, track);
 }
 
 static int rna_trackingTrack_select_get(PointerRNA *ptr)
@@ -363,8 +363,8 @@ static void rna_trackingMarker_frame_set(PointerRNA *ptr, int value)
 		MovieTrackingMarker new_marker = *marker;
 		new_marker.framenr = value;
 
-		BKE_tracking_delete_marker(track, marker->framenr);
-		BKE_tracking_insert_marker(track, &new_marker);
+		BKE_tracking_marker_delete(track, marker->framenr);
+		BKE_tracking_marker_insert(track, &new_marker);
 	}
 }
 
@@ -372,14 +372,14 @@ static void rna_tracking_markerPattern_update(Main *UNUSED(bmain), Scene *UNUSED
 {
 	MovieTrackingMarker *marker = (MovieTrackingMarker *)ptr->data;
 
-	BKE_tracking_clamp_marker(marker, CLAMP_PAT_DIM);
+	BKE_tracking_marker_clamp(marker, CLAMP_PAT_DIM);
 }
 
 static void rna_tracking_markerSearch_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
 	MovieTrackingMarker *marker = (MovieTrackingMarker *)ptr->data;
 
-	BKE_tracking_clamp_marker(marker, CLAMP_SEARCH_DIM);
+	BKE_tracking_marker_clamp(marker, CLAMP_SEARCH_DIM);
 }
 
 static void rna_trackingDopesheet_tagUpdate(Main *UNUSED(bmain), Scene *scene, PointerRNA *ptr)
@@ -402,7 +402,7 @@ static void add_tracks_to_base(MovieClip *clip, MovieTracking *tracking, ListBas
 	BKE_movieclip_get_size(clip, &user, &width, &height);
 
 	for (a = 0; a < number; a++)
-		BKE_tracking_add_track(tracking, tracksbase, 0, 0, frame, width, height);
+		BKE_tracking_track_add(tracking, tracksbase, 0, 0, frame, width, height);
 }
 
 static void rna_trackingTracks_add(ID *id, MovieTracking *tracking, int frame, int number)
@@ -429,7 +429,7 @@ static void rna_trackingObject_tracks_add(ID *id, MovieTrackingObject *object, i
 
 static MovieTrackingObject *rna_trackingObject_new(MovieTracking *tracking, const char *name)
 {
-	MovieTrackingObject *object = BKE_tracking_new_object(tracking, name);
+	MovieTrackingObject *object = BKE_tracking_object_add(tracking, name);
 
 	WM_main_add_notifier(NC_MOVIECLIP | NA_EDITED, NULL);
 
@@ -438,14 +438,14 @@ static MovieTrackingObject *rna_trackingObject_new(MovieTracking *tracking, cons
 
 void rna_trackingObject_remove(MovieTracking *tracking, MovieTrackingObject *object)
 {
-	BKE_tracking_remove_object(tracking, object);
+	BKE_tracking_object_delete(tracking, object);
 
 	WM_main_add_notifier(NC_MOVIECLIP | NA_EDITED, NULL);
 }
 
 static MovieTrackingMarker *rna_trackingMarkers_find_frame(MovieTrackingTrack *track, int framenr)
 {
-	return BKE_tracking_exact_marker(track, framenr);
+	return BKE_tracking_marker_get_exact(track, framenr);
 }
 
 static MovieTrackingMarker *rna_trackingMarkers_insert_frame(MovieTrackingTrack *track, int framenr, float *co)
@@ -456,7 +456,7 @@ static MovieTrackingMarker *rna_trackingMarkers_insert_frame(MovieTrackingTrack
 	marker.framenr = framenr;
 	copy_v2_v2(marker.pos, co);
 
-	new_marker = BKE_tracking_insert_marker(track, &marker);
+	new_marker = BKE_tracking_marker_insert(track, &marker);
 
 	WM_main_add_notifier(NC_MOVIECLIP | NA_EDITED, NULL);
 
@@ -468,7 +468,7 @@ void rna_trackingMarkers_delete_frame(MovieTrackingTrack *track, int framenr)
 	if (track->markersnr == 1)
 		return;
 
-	BKE_tracking_delete_marker(track, framenr);
+	BKE_tracking_marker_delete(track, framenr);
 
 	WM_main_add_notifier(NC_MOVIECLIP | NA_EDITED, NULL);
 }