Minor code cleanup after resolving conflicts

2011-12-31 09:30:39 +00:00
parent 1ad83b4cba
commit 59b406ce73
1 changed files with 1 additions and 1 deletions
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -1377,7 +1377,7 @@ int BKE_tracking_next(MovieTrackingContext *context)
 				MEM_freeN(image_new);
 			}

-			coords_correct= !onbound && !isnan(x2) && !isnan(y2) && finite(x2) && finite(y2);
+			coords_correct= !isnan(x2) && !isnan(y2) && finite(x2) && finite(y2);
 			if(coords_correct && !onbound && tracked) {
 				if(context->first_time) {
 					#pragma omp critical