blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Cleanup: Simplify public tracking API 

Remove functions which are a trivial accessor.
This commit is contained in:
Sergey Sharybin 2022-10-14 11:00:38 +02:00
parent d37efe332c
commit f383dfabf7
3 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

11
source/blender/makesrna/intern/rna_tracking.c
View File

@ -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) {