griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Bastien Montagne
2018-08-13 13:49:48 +02:00
parent 8656081561 798a83e35f
commit b7784c0cd2
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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