diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2018-08-15 16:00:38 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2018-08-15 16:06:11 +0300 |
commit | 5a89dfe06baa2ab96947bb6b5f6c63c4b864fab2 (patch) | |
tree | 9dec75c74e0d33895010e0b30b2117d8d0eeb8c6 /source/blender/blenkernel/intern/movieclip.c | |
parent | ad7cb024048b82b4d6cb3093a9c14ec51897d470 (diff) |
Clip Reconstruction: Cleanup - use const for selection synchronize
In order to avoid the discard qualifier warning I had to change a few extra
things.
Diffstat (limited to 'source/blender/blenkernel/intern/movieclip.c')
-rw-r--r-- | source/blender/blenkernel/intern/movieclip.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index 69d237e1296..d63ac7df3ce 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -1609,20 +1609,20 @@ bool BKE_movieclip_put_frame_if_possible(MovieClip *clip, return result; } -static void movieclip_selection_synchronize(MovieClip *clip_dst, MovieClip *clip_src) +static void movieclip_selection_synchronize(MovieClip *clip_dst, const MovieClip *clip_src) { BLI_assert(clip_dst != clip_src); - MovieTracking *tracking_dst = &clip_dst->tracking, *tracking_src = &clip_src->tracking; + MovieTracking *tracking_dst = &clip_dst->tracking, tracking_src = clip_src->tracking; /* Syncs the active object, track and plane track. */ - tracking_dst->objectnr = tracking_src->objectnr; - const int active_track_index = BLI_findindex(&tracking_src->tracks, tracking_src->act_track); - const int active_plane_track_index = BLI_findindex(&tracking_src->plane_tracks, tracking_src->act_plane_track); + tracking_dst->objectnr = tracking_src.objectnr; + const int active_track_index = BLI_findindex(&tracking_src.tracks, tracking_src.act_track); + const int active_plane_track_index = BLI_findindex(&tracking_src.plane_tracks, tracking_src.act_plane_track); tracking_dst->act_track = BLI_findlink(&tracking_dst->tracks, active_track_index); tracking_dst->act_plane_track = BLI_findlink(&tracking_dst->plane_tracks, active_plane_track_index); /* Syncs the tracking selection flag. */ MovieTrackingObject *tracking_object_dst, *tracking_object_src; - tracking_object_src = tracking_src->objects.first; + tracking_object_src = tracking_src.objects.first; for (tracking_object_dst = tracking_dst->objects.first; tracking_object_dst != NULL; @@ -1631,7 +1631,7 @@ static void movieclip_selection_synchronize(MovieClip *clip_dst, MovieClip *clip { ListBase *tracksbase_dst, *tracksbase_src; tracksbase_dst = BKE_tracking_object_get_tracks(tracking_dst, tracking_object_dst); - tracksbase_src = BKE_tracking_object_get_tracks(tracking_src, tracking_object_src); + tracksbase_src = BKE_tracking_object_get_tracks(&tracking_src, tracking_object_src); MovieTrackingTrack *track_dst, *track_src; track_src = tracksbase_src->first; |