diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-30 22:15:44 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-30 22:15:44 +0400 |
commit | 792452a7e53aa92361145e415491943bc91d8a6e (patch) | |
tree | a98180e7bb849ae8ef75a12187caf7548075716c /source/blender/blenkernel/intern/tracking.c | |
parent | 3c6e818b22ed9153604cfb87476845416112b7d8 (diff) |
Disable markers when doing frame-by-frame tracking and tracker library returns failure
Diffstat (limited to 'source/blender/blenkernel/intern/tracking.c')
-rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 6bf9b646c35..6eeae07cb1b 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -787,11 +787,11 @@ typedef struct MovieTrackingContext { MovieTrackingSettings settings; TracksMap *tracks_map; - short backwards, disable_failed, sequence; + short backwards, sequence; int sync_frame; } MovieTrackingContext; -MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser *user, short backwards, short disable_failed, short sequence) +MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser *user, short backwards, short sequence) { MovieTrackingContext *context= MEM_callocN(sizeof(MovieTrackingContext), "trackingContext"); MovieTracking *tracking= &clip->tracking; @@ -803,7 +803,6 @@ MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser *u context->settings= *settings; context->backwards= backwards; - context->disable_failed= disable_failed; context->sync_frame= user->framenr; context->first_time= 1; context->sequence= sequence; @@ -1379,7 +1378,7 @@ int BKE_tracking_next(MovieTrackingContext *context) } coords_correct= !onbound && !isnan(x2) && !isnan(y2) && finite(x2) && finite(y2); - if(coords_correct && (tracked || !context->disable_failed)) { + if(coords_correct && !onbound && tracked) { if(context->first_time) { #pragma omp critical { |