[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43032] trunk/blender/source/blender/ blenkernel/intern/tracking.c: Code cleanup: do not use check for nan when doing check for finite due to

Sergey Sharybin sergey.vfx at gmail.com
Sat Dec 31 12:03:33 CET 2011


Revision: 43032
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43032
Author:   nazgul
Date:     2011-12-31 11:03:32 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
Code cleanup: do not use check for nan when doing check for finite due to
finite() would be FALSE in case of nan to.

Thanks to Campbell for this information.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/tracking.c

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2011-12-31 10:46:30 UTC (rev 43031)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2011-12-31 11:03:32 UTC (rev 43032)
@@ -1258,8 +1258,7 @@
 			double x1, y1, x2, y2;
 			ImBuf *ibuf= NULL;
 			MovieTrackingMarker marker_new, *marker_keyed;
-			int onbound= 0, coords_correct= 0;
-			int nextfra;
+			int onbound= 0, nextfra;
 
 			if(track->pattern_match==TRACK_MATCH_KEYFRAME)
 				need_readjust= context->first_time;
@@ -1377,8 +1376,7 @@
 				MEM_freeN(image_new);
 			}
 
-			coords_correct= !isnan(x2) && !isnan(y2) && finite(x2) && finite(y2);
-			if(coords_correct && !onbound && tracked) {
+			if(tracked && !onbound && finite(x2) && finite(y2)) {
 				if(context->first_time) {
 					#pragma omp critical
 					{




More information about the Bf-blender-cvs mailing list