[Bf-blender-cvs] [f383dfabf74] master: Cleanup: Simplify public tracking API

[Sergey Sharybin]

Commit: f383dfabf746b94fdde29afaedada1cff8853f28
Author: Sergey Sharybin
Date:   Fri Oct 14 11:00:38 2022 +0200
Branches: master
https://developer.blender.org/rBf383dfabf746b94fdde29afaedada1cff8853f28

Cleanup: Simplify public tracking API

Remove functions which are a trivial accessor.

===================================================================

M	source/blender/blenkernel/BKE_tracking.h
M	source/blender/blenkernel/intern/tracking.c
M	source/blender/makesrna/intern/rna_tracking.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h
index 5746e49f644..0090c35c254 100644
--- a/source/blender/blenkernel/BKE_tracking.h
+++ b/source/blender/blenkernel/BKE_tracking.h
@@ -765,16 +765,8 @@ void BKE_tracking_dopesheet_update(struct MovieTracking *tracking);
  */
 struct MovieTrackingObject *BKE_tracking_find_object_for_track(
     const struct MovieTracking *tracking, const struct MovieTrackingTrack *track);
-struct ListBase *BKE_tracking_find_tracks_list_for_track(struct MovieTracking *tracking,
-                                                         const struct MovieTrackingTrack *track);
-
-/**
- * \note Returns NULL if the track comes from camera object,.
- */
 struct MovieTrackingObject *BKE_tracking_find_object_for_plane_track(
     const struct MovieTracking *tracking, const struct MovieTrackingPlaneTrack *plane_track);
-struct ListBase *BKE_tracking_find_tracks_list_for_plane_track(
-    struct MovieTracking *tracking, const struct MovieTrackingPlaneTrack *plane_track);
 
 void BKE_tracking_get_rna_path_for_track(const struct MovieTracking *tracking,
                                          const struct MovieTrackingTrack *track,
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index ea8bccfb30f..bf6fb95f71e 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -3319,15 +3319,6 @@ MovieTrackingObject *BKE_tracking_find_object_for_track(const MovieTracking *tra
   return NULL;
 }
 
-ListBase *BKE_tracking_find_tracks_list_for_track(MovieTracking *tracking,
-                                                  const MovieTrackingTrack *track)
-{
-  MovieTrackingObject *tracking_object = BKE_tracking_find_object_for_track(tracking, track);
-  BLI_assert(tracking_object != NULL);
-
-  return &tracking_object->tracks;
-}
-
 MovieTrackingObject *BKE_tracking_find_object_for_plane_track(
     const MovieTracking *tracking, const MovieTrackingPlaneTrack *plane_track)
 {
@@ -3339,16 +3330,6 @@ MovieTrackingObject *BKE_tracking_find_object_for_plane_track(
   return NULL;
 }
 
-ListBase *BKE_tracking_find_tracks_list_for_plane_track(MovieTracking *tracking,
-                                                        const MovieTrackingPlaneTrack *plane_track)
-{
-  MovieTrackingObject *tracking_object = BKE_tracking_find_object_for_plane_track(tracking,
-                                                                                  plane_track);
-  BLI_assert(tracking_object != NULL);
-
-  return &tracking_object->plane_tracks;
-}
-
 void BKE_tracking_get_rna_path_for_track(const struct MovieTracking *tracking,
                                          const struct MovieTrackingTrack *track,
                                          char *rna_path,
diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c
index e9eef9881a7..17c3f1923e5 100644
--- a/source/blender/makesrna/intern/rna_tracking.c
+++ b/source/blender/makesrna/intern/rna_tracking.c
@@ -251,13 +251,14 @@ static void rna_trackingTrack_name_set(PointerRNA *ptr, const char *value)
 {
   MovieClip *clip = (MovieClip *)ptr->owner_id;
   MovieTrackingTrack *track = (MovieTrackingTrack *)ptr->data;
-  ListBase *tracksbase = BKE_tracking_find_tracks_list_for_track(&clip->tracking, track);
+  MovieTrackingObject *tracking_object = BKE_tracking_find_object_for_track(&clip->tracking,
+                                                                            track);
   /* Store old name, for the animation fix later. */
   char old_name[sizeof(track->name)];
   BLI_strncpy(old_name, track->name, sizeof(track->name));
   /* Update the name, */
   BLI_strncpy(track->name, value, sizeof(track->name));
-  BKE_tracking_track_unique_name(tracksbase, track);
+  BKE_tracking_track_unique_name(&tracking_object->tracks, track);
   /* Fix animation paths. */
   AnimData *adt = BKE_animdata_from_id(&clip->id);
   if (adt != NULL) {
@@ -335,14 +336,14 @@ static void rna_trackingPlaneTrack_name_set(PointerRNA *ptr, const char *value)
 {
   MovieClip *clip = (MovieClip *)ptr->owner_id;
   MovieTrackingPlaneTrack *plane_track = (MovieTrackingPlaneTrack *)ptr->data;
-  ListBase *plane_tracks_base = BKE_tracking_find_tracks_list_for_plane_track(&clip->tracking,
-                                                                              plane_track);
+  MovieTrackingObject *tracking_object = BKE_tracking_find_object_for_plane_track(&clip->tracking,
+                                                                                  plane_track);
   /* Store old name, for the animation fix later. */
   char old_name[sizeof(plane_track->name)];
   BLI_strncpy(old_name, plane_track->name, sizeof(plane_track->name));
   /* Update the name, */
   BLI_strncpy(plane_track->name, value, sizeof(plane_track->name));
-  BKE_tracking_plane_track_unique_name(plane_tracks_base, plane_track);
+  BKE_tracking_plane_track_unique_name(&tracking_object->plane_tracks, plane_track);
   /* Fix animation paths. */
   AnimData *adt = BKE_animdata_from_id(&clip->id);
   if (adt != NULL) {