diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-14 10:12:20 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-14 10:12:20 +0400 |
| commit | 535aee820b22385051e5ec12f39883735dfef694 (patch) | |
| tree | da9774b55f3041ec32da816200509c1c825a6c4c /source/blender/editors/space_clip/tracking_ops.c | |
| parent | b865c0314f4bd2ead240accff1d06234f614acd2 (diff) | |
| parent | a7823dda6941420ba1317ac3682c8b563a47023c (diff) | |
Merging r42602 through r42620 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/editors/space_clip/tracking_ops.c')
| -rw-r--r-- | source/blender/editors/space_clip/tracking_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 49ea3247a55..59631e3a181 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -1317,7 +1317,7 @@ static int track_markers_initjob(bContext *C, TrackMarkersJob *tmj, int backward else if(settings->speed==TRACKING_SPEED_DOUBLE) tmj->delay/= 2; } - tmj->context= BKE_tracking_context_new(clip, &sc->user, backwards); + tmj->context= BKE_tracking_context_new(clip, &sc->user, backwards, 1); clip->tracking_context= tmj->context; @@ -1428,7 +1428,7 @@ static int track_markers_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; /* do not disable tracks due to threshold when tracking frame-by-frame */ - context= BKE_tracking_context_new(clip, &sc->user, backwards); + context= BKE_tracking_context_new(clip, &sc->user, backwards, sequence); while(framenr != efra) { if(!BKE_tracking_next(context)) |