diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-08-13 14:49:48 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-08-13 14:49:48 +0300 |
| commit | b7784c0cd23b0504c04487705aea96efb5050a9b (patch) | |
| tree | bfb482a462fd761aeb7aac9a4af87a4420058706 /source/blender/blenkernel/intern/tracking.c | |
| parent | 865608156157951e1e1c1bda1906e5fbfd762ced (diff) | |
| parent | 798a83e35faefb269654956dc51c8b2e45b1fd66 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/tracking.c')
| -rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index fe9cf1e9609..d8ee5e5fc7d 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -214,14 +214,18 @@ static void tracking_tracks_copy(ListBase *tracks_dst, const ListBase *tracks_sr /* copy the whole list of plane tracks (need whole MovieTracking structures due to embedded pointers to tracks). * WARNING: implies tracking_[dst/src] and their tracks have already been copied. */ static void tracking_plane_tracks_copy( - ListBase *plane_tracks_dst, const ListBase *plane_tracks_src, GHash *tracks_mapping, const int flag) + ListBase *plane_tracks_list_dst, const ListBase *plane_tracks_list_src, + GHash *tracks_mapping, const int flag) { MovieTrackingPlaneTrack *plane_track_dst, *plane_track_src; - BLI_listbase_clear(plane_tracks_dst); + BLI_listbase_clear(plane_tracks_list_dst); - for (plane_track_src = plane_tracks_src->first; plane_track_src != NULL; plane_track_src = plane_track_src->next) { - plane_track_dst = MEM_dupallocN(plane_tracks_src); + for (plane_track_src = plane_tracks_list_src->first; + plane_track_src != NULL; + plane_track_src = plane_track_src->next) + { + plane_track_dst = MEM_dupallocN(plane_track_src); if (plane_track_src->markers) { plane_track_dst->markers = MEM_dupallocN(plane_track_src->markers); } @@ -232,7 +236,7 @@ static void tracking_plane_tracks_copy( if ((flag & LIB_ID_CREATE_NO_USER_REFCOUNT) == 0) { id_us_plus(&plane_track_dst->image->id); } - BLI_addtail(plane_tracks_dst, plane_track_dst); + BLI_addtail(plane_tracks_list_dst, plane_track_dst); } } |