tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

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).
This commit is contained in:
Sergey Sharybin 2022-10-17 15:15:53 +02:00
parent f383dfabf7
commit 294ff0de43
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/BKE_tracking.h
View File

@ -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,

8
source/blender/blenkernel/intern/tracking.c
View File

@ -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;
}

2
source/blender/draw/engines/overlay/overlay_extra.cc
View File

@ -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];

3
source/blender/editors/space_view3d/view3d_select.cc
View File

@ -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;
}