Merging r42896 through r42944 from trunk into soc-2911-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Dec 2011 18:31:32 +0000 (18:31 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Dec 2011 18:31:32 +0000 (18:31 +0000)
1  2 
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/tracking.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_constraint_types.h

index dd5b78c5b8ddf20e1487f435eac352c129128bed,d911e68236b09b4bd9b99de06db2ccb476554c0c..918fc5f347dde2a4db5fac026bc07f00bdf8b9a3
@@@ -2738,10 -2406,9 +2738,11 @@@ static int detect_features_exec(bContex
  {
        SpaceClip *sc= CTX_wm_space_clip(C);
        MovieClip *clip= ED_space_clip(sc);
-       ImBuf *ibuf= BKE_movieclip_get_ibuf_flag(clip, &sc->user, 0);
+       int clip_flag= clip->flag&MCLIP_TIMECODE_FLAGS;
+       ImBuf *ibuf= BKE_movieclip_get_ibuf_flag(clip, &sc->user, clip_flag);
 -      MovieTrackingTrack *track= clip->tracking.tracks.first;
 +      MovieTracking *tracking= &clip->tracking;
 +      ListBase *tracksbase= BKE_tracking_get_tracks(tracking);
 +      MovieTrackingTrack *track= tracksbase->first;
        int placement= RNA_enum_get(op->ptr, "placement");
        int margin= RNA_int_get(op->ptr, "margin");
        int min_trackability= RNA_int_get(op->ptr, "min_trackability");