[Bf-blender-cvs] [294ff0de43c] master: Cleanup: More clear function name

[Sergey Sharybin]

Commit: 294ff0de43c4b4af0b2a7cfe5de47b86badfe1c4
Author: Sergey Sharybin
Date:   Mon Oct 17 15:15:53 2022 +0200
Branches: master
https://developer.blender.org/rB294ff0de43c4b4af0b2a7cfe5de47b86badfe1c4

Cleanup: More clear function name

Make it explicit in the name that track index is the one used for
selection (previously it read as if the track index is within its
list).

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

M	source/blender/blenkernel/BKE_tracking.h
M	source/blender/blenkernel/intern/tracking.c
M	source/blender/draw/engines/overlay/overlay_extra.cc
M	source/blender/editors/space_view3d/view3d_select.cc

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

diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h
index 0090c35c254..38cb2b17f72 100644
--- a/source/blender/blenkernel/BKE_tracking.h
+++ b/source/blender/blenkernel/BKE_tracking.h
@@ -234,9 +234,8 @@ void BKE_tracking_tracks_average(struct MovieTrackingTrack *dst_track,
                                  /*const*/ struct MovieTrackingTrack **src_tracks,
                                  int num_src_tracks);
 
-struct MovieTrackingTrack *BKE_tracking_track_get_indexed(struct MovieTracking *tracking,
-                                                          int tracknr,
-                                                          struct ListBase **r_tracksbase);
+struct MovieTrackingTrack *BKE_tracking_track_get_for_selection_index(
+    struct MovieTracking *tracking, int selection_index, struct ListBase **r_tracksbase);
 
 float *BKE_tracking_track_get_mask(int frame_width,
                                    int frame_height,
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index bf6fb95f71e..a49464a11eb 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -1009,16 +1009,16 @@ void BKE_tracking_tracks_average(MovieTrackingTrack *dst_track,
   tracking_average_tracks(dst_track, src_tracks, num_src_tracks);
 }
 
-MovieTrackingTrack *BKE_tracking_track_get_indexed(MovieTracking *tracking,
-                                                   int tracknr,
-                                                   ListBase **r_tracksbase)
+MovieTrackingTrack *BKE_tracking_track_get_for_selection_index(MovieTracking *tracking,
+                                                               int selection_index,
+                                                               ListBase **r_tracksbase)
 {
   int cur = 1;
 
   LISTBASE_FOREACH (MovieTrackingObject *, object, &tracking->objects) {
     LISTBASE_FOREACH (MovieTrackingTrack *, track, &object->tracks) {
       if (track->flag & TRACK_HAS_BUNDLE) {
-        if (cur == tracknr) {
+        if (cur == selection_index) {
           *r_tracksbase = &object->tracks;
           return track;
         }
diff --git a/source/blender/draw/engines/overlay/overlay_extra.cc b/source/blender/draw/engines/overlay/overlay_extra.cc
index 77db35028e2..f272c6f3b75 100644
--- a/source/blender/draw/engines/overlay/overlay_extra.cc
+++ b/source/blender/draw/engines/overlay/overlay_extra.cc
@@ -859,7 +859,7 @@ static void camera_view3d_reconstruction(
                                ((v3d->shading.type != OB_SOLID) || !XRAY_FLAG_ENABLED(v3d));
 
   MovieTracking *tracking = &clip->tracking;
-  /* Index must start in 1, to mimic BKE_tracking_track_get_indexed. */
+  /* Index must start in 1, to mimic BKE_tracking_track_get_for_selection_index. */
   int track_index = 1;
 
   float bundle_color_custom[3];
diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc
index f777a4b3c49..f57cf009e6b 100644
--- a/source/blender/editors/space_view3d/view3d_select.cc
+++ b/source/blender/editors/space_view3d/view3d_select.cc
@@ -2430,7 +2430,8 @@ static bool ed_object_select_pick_camera_track(bContext *C,
       continue;
     }
 
-    track = BKE_tracking_track_get_indexed(&clip->tracking, hitresult >> 16, &tracksbase);
+    track = BKE_tracking_track_get_for_selection_index(
+        &clip->tracking, hitresult >> 16, &tracksbase);
     found = true;
     break;
   }