diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-07 15:02:34 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-07 15:02:34 +0400 |
| commit | dbc9227a3247e2138f964b1687e3467f3f4b9741 (patch) | |
| tree | 0e436257684ca11abbc3cc020058514a660fbc62 /source/blender/blenkernel | |
| parent | f354d44cbad105fc63c64c2cb243c4ceaa8d0ef0 (diff) | |
Disable markers when doing frame-by-frame tracking and tracker library returns failure
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_tracking.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h index 6c43493d1d4..d7bf7cb410f 100644 --- a/source/blender/blenkernel/BKE_tracking.h +++ b/source/blender/blenkernel/BKE_tracking.h @@ -98,7 +98,7 @@ struct MovieTrackingReconstruction *BKE_tracking_object_reconstruction(struct Mo /* 2D tracking */ struct MovieTrackingContext *BKE_tracking_context_new(struct MovieClip *clip, struct MovieClipUser *user, - short backwards, short disable_failed); + short backwards); void BKE_tracking_context_free(struct MovieTrackingContext *context); void BKE_tracking_sync(struct MovieTrackingContext *context); void BKE_tracking_sync_user(struct MovieClipUser *user, struct MovieTrackingContext *context); diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index d1929e25c40..164320562f4 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -784,11 +784,11 @@ typedef struct MovieTrackingContext { MovieTrackingSettings settings; TracksMap *tracks_map; - short backwards, disable_failed; + short backwards; int sync_frame; } MovieTrackingContext; -MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser *user, short backwards, short disable_failed) +MovieTrackingContext *BKE_tracking_context_new(MovieClip *clip, MovieClipUser *user, short backwards) { MovieTrackingContext *context= MEM_callocN(sizeof(MovieTrackingContext), "trackingContext"); MovieTracking *tracking= &clip->tracking; @@ -800,7 +800,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; @@ -1356,7 +1355,7 @@ int BKE_tracking_next(MovieTrackingContext *context) } coords_correct= !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 { |