Merging r42648 through r42722 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / transform / transform_generics.c
index e7e1ee43c5d44814e33816e383fb80280a708a28..f6aca0336beec1b64ef612e804c156cb2d65d6b5 100644 (file)
@@ -641,10 +641,11 @@ static void recalcData_clip(TransInfo *t)
 {
        SpaceClip *sc= t->sa->spacedata.first;
        MovieClip *clip= ED_space_clip(sc);
+       ListBase *tracksbase= BKE_tracking_get_tracks(&clip->tracking);
        MovieTrackingTrack *track;
        
        if(t->state == TRANS_CANCEL) {
-               track= clip->tracking.tracks.first;
+               track= tracksbase->first;
                while(track) {
                        if(TRACK_VIEW_SELECTED(sc, track)) {
                                MovieTrackingMarker *marker= BKE_tracking_ensure_marker(track, sc->user.framenr);
@@ -658,7 +659,7 @@ static void recalcData_clip(TransInfo *t)
        
        flushTransTracking(t);
        
-       track= clip->tracking.tracks.first;
+       track= tracksbase->first;
        while(track) {
                if(TRACK_VIEW_SELECTED(sc, track)) {
                        if (t->mode == TFM_TRANSLATION) {