[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42486] branches/soc-2011-tomato/source/ blender: Disable markers when doing frame-by-frame tracking and tracker library returns failure

[Sergey Sharybin]

Revision: 42486
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42486
Author:   nazgul
Date:     2011-12-07 11:02:34 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
Disable markers when doing frame-by-frame tracking and tracker library returns failure

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h	2011-12-07 10:53:51 UTC (rev 42485)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_tracking.h	2011-12-07 11:02:34 UTC (rev 42486)
@@ -98,7 +98,7 @@
 
 /* 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);

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c	2011-12-07 10:53:51 UTC (rev 42485)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c	2011-12-07 11:02:34 UTC (rev 42486)
@@ -784,11 +784,11 @@
 	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 @@
 
 	context->settings= *settings;
 	context->backwards= backwards;
-	context->disable_failed= disable_failed;
 	context->sync_frame= user->framenr;
 	context->first_time= 1;
 
@@ -1356,7 +1355,7 @@
 			}
 
 			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
 					{

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2011-12-07 10:53:51 UTC (rev 42485)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2011-12-07 11:02:34 UTC (rev 42486)
@@ -1317,7 +1317,7 @@
 		else if(settings->speed==TRACKING_SPEED_DOUBLE) tmj->delay/= 2;
 	}
 
-	tmj->context= BKE_tracking_context_new(clip, &sc->user, backwards, 1);
+	tmj->context= BKE_tracking_context_new(clip, &sc->user, backwards);
 
 	clip->tracking_context= tmj->context;
 
@@ -1428,7 +1428,7 @@
 		return OPERATOR_CANCELLED;
 
 	/* do not disable tracks due to threshold when tracking frame-by-frame */
-	context= BKE_tracking_context_new(clip, &sc->user, backwards, sequence);
+	context= BKE_tracking_context_new(clip, &sc->user, backwards);
 
 	while(framenr != efra) {
 		if(!BKE_tracking_next(context))