Merging r47683 through r47690 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 10 Jun 2012 16:26:00 +0000 (16:26 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 10 Jun 2012 16:26:00 +0000 (16:26 +0000)
1  2 
source/blender/blenloader/intern/readfile.c

index a1d255e67e8547ca1eee31fbc57f41dbe59f9c20,c727717dac8226e9f40c246bf7037a94f335eff9..3c7389ceba96e2a4d6716aef8516aff43592d2b9
@@@ -6122,10 -6122,9 +6122,9 @@@ static void direct_link_movieTracks(Fil
        MovieTrackingTrack *track;
        
        link_list(fd, tracksbase);
 -      
 +
        for (track = tracksbase->first; track; track = track->next) {
                track->markers = newdataadr(fd, track->markers);
-               track->gpd = newlibadr_us(fd, clip->id.lib, track->gpd);
        }
  }