[Bf-blender-cvs] [c167ac1] master: Tracking: Fix wrong logic in tracks synchronization

[Sergey Sharybin]

Commit: c167ac155696dac2ded87ca2de1626d5fb3b23cf
Author: Sergey Sharybin
Date:   Mon Dec 15 14:39:59 2014 +0500
Branches: master
https://developer.blender.org/rBc167ac155696dac2ded87ca2de1626d5fb3b23cf

Tracking: Fix wrong logic in tracks synchronization

There was some stupidness in the way how tracks are synchronized from the job
to actual DNA data leading to all sort of weird and wonderful failures again.

===================================================================

M	source/blender/blenkernel/intern/tracking_auto.c

===================================================================

diff --git a/source/blender/blenkernel/intern/tracking_auto.c b/source/blender/blenkernel/intern/tracking_auto.c
index 8f84b22..22a380e 100644
--- a/source/blender/blenkernel/intern/tracking_auto.c
+++ b/source/blender/blenkernel/intern/tracking_auto.c
@@ -431,7 +431,7 @@ bool BKE_autotrack_context_step(AutoTrackContext *context)
 			}
 			else {
 				options->is_failed = true;
-				options->failed_frame = frame;
+				options->failed_frame = frame + frame_delta;
 			}
 			ok = true;
 		}
@@ -463,22 +463,18 @@ void BKE_autotrack_context_sync(AutoTrackContext *context)
 			AutoTrackOptions *options = &context->options[track];
 			int track_frame = BKE_movieclip_remap_scene_to_clip_frame(
 				context->clips[options->clip_index], frame);
-			if (options->is_failed) {
-				if (options->failed_frame == track_frame) {
-					MovieTrackingMarker *prev_marker =
-						BKE_tracking_marker_get_exact(
-							  options->track,
-							  frame);
-					if (prev_marker) {
-						marker = *prev_marker;
-						marker.framenr = context->backwards ?
-						                 track_frame - 1 :
-						                 track_frame + 1;
-						marker.flag |= MARKER_DISABLED;
-						BKE_tracking_marker_insert(options->track, &marker);
-					}
+			if (options->is_failed && options->failed_frame == track_frame) {
+				MovieTrackingMarker *prev_marker =
+					BKE_tracking_marker_get_exact(options->track, frame);
+				if (prev_marker) {
+					marker = *prev_marker;
+					marker.framenr = context->backwards ?
+					                 track_frame - 1 :
+					                 track_frame + 1;
+					marker.flag |= MARKER_DISABLED;
+					BKE_tracking_marker_insert(options->track, &marker);
+					continue;
 				}
-				continue;
 			}
 			if (libmv_autoTrackGetMarker(context->autotrack,
 			                             clip,