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

Woops, minr style changes are needed.

Browse Source
This commit is contained in:
Sergey Sharybin
2013-09-06 10:23:21 +00:00
parent 1718c002d6
commit 7d416b8d79
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2407,12 +2407,12 @@ static void tracks_map_merge(TracksMap *map, MovieTracking *tracking)
BLI_remlink(old_tracks, old_track);
BLI_addtail(&tracks, old_track);
/* Copy flags like selection back to the track map */
/* Copy flags like selection back to the track map. */
track->flag = old_track->flag;
track->pat_flag = old_track->pat_flag;
track->search_flag = old_track->search_flag;
/* Copy all the rest settings back from the map to the actual tracks, */
/* Copy all the rest settings back from the map to the actual tracks. */
MEM_freeN(old_track->markers);
*old_track = *track;
old_track->markers = MEM_dupallocN(old_track->markers);