[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43027] trunk/blender/source/blender/ blenkernel/intern/tracking.c: Minor code cleanup after resolving conflicts

[Sergey Sharybin]

Hi,

Wasn't sure about this. Thanks for the info :)
Fix is in svn now.

On Sat, Dec 31, 2011 at 4:55 PM, Campbell Barton <ideasman42 at gmail.com>wrote:

> You shouldn't need to test both isnan and finite, testing only
> finite() will be false for both inf and nan values.
>
> On Sat, Dec 31, 2011 at 8:30 PM, Sergey Sharybin <sergey.vfx at gmail.com>
> wrote:
> > Revision: 43027
> >
> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43027
> > Author:   nazgul
> > Date:     2011-12-31 09:30:39 +0000 (Sat, 31 Dec 2011)
> > Log Message:
> > -----------
> > Minor code cleanup after resolving conflicts
> >
> > 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 09:29:49 UTC (rev 43026)
> > +++ trunk/blender/source/blender/blenkernel/intern/tracking.c
> 2011-12-31 09:30:39 UTC (rev 43027)
> > @@ -1377,7 +1377,7 @@
> >                                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
> >
> > _______________________________________________
> > Bf-blender-cvs mailing list
> > Bf-blender-cvs at blender.org
> > http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>
>
>
> --
> - Campbell
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers
>



-- 
With best regards, Sergey Sharybin