Merging r42896 through r42944 from trunk into soc-2911-tomato
[blender.git] / source / blender / editors / space_clip / tracking_ops.c
index dd5b78c5b8ddf20e1487f435eac352c129128bed..918fc5f347dde2a4db5fac026bc07f00bdf8b9a3 100644 (file)
@@ -2738,7 +2738,8 @@ static int detect_features_exec(bContext *C, wmOperator *op)
 {
        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);
        MovieTracking *tracking= &clip->tracking;
        ListBase *tracksbase= BKE_tracking_get_tracks(tracking);
        MovieTrackingTrack *track= tracksbase->first;