diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-31 13:30:39 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-31 13:30:39 +0400 |
commit | 59b406ce73990739a0fe949219afbf251e2eb4e1 (patch) | |
tree | 1a10f26e7befe75e7cd028b585c64700ff97805c /source/blender/blenkernel | |
parent | 1ad83b4cba0b30c904f6eb1a044bb807b4f1c8cc (diff) |
Minor code cleanup after resolving conflicts
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 5ef0491c03c..863080f80c5 100644 --- 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 |