[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43008] trunk/blender: Disable markers when doing frame-by-frame tracking and tracker library returns failure

[Sergey Sharybin]

Revision: 43008
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43008
Author:   nazgul
Date:     2011-12-30 18:15:44 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
Disable markers when doing frame-by-frame tracking and tracker library returns failure

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_tracking.h
    trunk/blender/source/blender/blenkernel/intern/tracking.c
    trunk/blender/source/blender/editors/space_clip/tracking_ops.c

Property Changed:
----------------
    trunk/blender/
    trunk/blender/source/blender/editors/space_outliner/


Property changes on: trunk/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42650-42652,42654-42655,42709-42710,42733-42734,42801
   + /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801

Modified: trunk/blender/source/blender/blenkernel/BKE_tracking.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_tracking.h	2011-12-30 18:06:02 UTC (rev 43007)
+++ trunk/blender/source/blender/blenkernel/BKE_tracking.h	2011-12-30 18:15:44 UTC (rev 43008)
@@ -98,7 +98,7 @@
 
 /* 2D tracking */
 struct MovieTrackingContext *BKE_tracking_context_new(struct MovieClip *clip, struct MovieClipUser *user,
-			short backwards, short disable_failed, short sequence);
+			short backwards, short sequence);
 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: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2011-12-30 18:06:02 UTC (rev 43007)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2011-12-30 18:15:44 UTC (rev 43008)
@@ -787,11 +787,11 @@
 	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 @@
 
 	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 @@
 			}
 
 			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
 					{

Modified: trunk/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_ops.c	2011-12-30 18:06:02 UTC (rev 43007)
+++ trunk/blender/source/blender/editors/space_clip/tracking_ops.c	2011-12-30 18:15:44 UTC (rev 43008)
@@ -1297,7 +1297,7 @@
 		else if(settings->speed==TRACKING_SPEED_DOUBLE) tmj->delay/= 2;
 	}
 
-	tmj->context= BKE_tracking_context_new(clip, &sc->user, backwards, 1, 1);
+	tmj->context= BKE_tracking_context_new(clip, &sc->user, backwards, 1);
 
 	clip->tracking_context= tmj->context;
 
@@ -1408,7 +1408,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, sequence);
+	context= BKE_tracking_context_new(clip, &sc->user, backwards, sequence);
 
 	while(framenr != efra) {
 		if(!BKE_tracking_next(context))


Property changes on: trunk/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42650-42652,42654-42655,42709-42710,42733-42734,42801
   + /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801