Refactor: Simplify tracking active element accessor API

Use active object accessor, and then access data from the
object. There is no need to have an API call for shortcut
of all object fields.

Should be no functional change.
This commit is contained in:
2022-10-07 11:32:21 +02:00
parent 1300da6d39
commit 4d1a116cdf
26 changed files with 344 additions and 532 deletions

View File

@@ -134,9 +134,9 @@ static void rna_tracking_active_object_index_range(
static PointerRNA rna_tracking_active_track_get(PointerRNA *ptr)
{
MovieClip *clip = (MovieClip *)ptr->owner_id;
MovieTrackingTrack *act_track = BKE_tracking_track_get_active(&clip->tracking);
const MovieTrackingObject *tracking_object = BKE_tracking_object_get_active(&clip->tracking);
return rna_pointer_inherit_refine(ptr, &RNA_MovieTrackingTrack, act_track);
return rna_pointer_inherit_refine(ptr, &RNA_MovieTrackingTrack, tracking_object->active_track);
}
static void rna_tracking_active_track_set(PointerRNA *ptr,
@@ -160,9 +160,10 @@ static void rna_tracking_active_track_set(PointerRNA *ptr,
static PointerRNA rna_tracking_active_plane_track_get(PointerRNA *ptr)
{
MovieClip *clip = (MovieClip *)ptr->owner_id;
MovieTrackingPlaneTrack *act_plane_track = BKE_tracking_plane_track_get_active(&clip->tracking);
const MovieTrackingObject *tracking_object = BKE_tracking_object_get_active(&clip->tracking);
return rna_pointer_inherit_refine(ptr, &RNA_MovieTrackingPlaneTrack, act_plane_track);
return rna_pointer_inherit_refine(
ptr, &RNA_MovieTrackingPlaneTrack, tracking_object->active_plane_track);
}
static void rna_tracking_active_plane_track_set(PointerRNA *ptr,