Merging r42800 through r42895 from trunk into soc-2011-tomato
[blender.git] / source / blender / blenkernel / intern / movieclip.c
index 7b2cfd46d337e0152619aca49b2f7fc050ccb93e..224ce003ea34c5828375511213c996e566eb3eca 100644 (file)
@@ -816,7 +816,8 @@ void BKE_movieclip_reload(MovieClip *clip)
 
 void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClipScopes *scopes)
 {
-       if(scopes->ok) return;
+       if(scopes->ok)
+               return;
 
        if(scopes->track_preview) {
                IMB_freeImBuf(scopes->track_preview);
@@ -827,8 +828,10 @@ void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClip
        scopes->track= NULL;
 
        if(clip) {
-               if(clip->tracking.act_track) {
-                       MovieTrackingTrack *track= clip->tracking.act_track;
+               MovieTrackingTrack *act_track= BKE_tracking_active_track(&clip->tracking);
+
+               if(act_track) {
+                       MovieTrackingTrack *track= act_track;
                        MovieTrackingMarker *marker= BKE_tracking_get_marker(track, user->framenr);
 
                        if(marker->flag&MARKER_DISABLED) {