[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26069] branches/soc-2008-mxcurioni/source /blender/freestyle/intern/geometry/SweepLine.h: Fixed a bug in SweepLine. add() that the returned value of

[Tamito Kajiyama]

Revision: 26069
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26069
Author:   kjym3
Date:     2010-01-18 04:54:15 +0100 (Mon, 18 Jan 2010)

Log Message:
-----------
Fixed a bug in SweepLine.add() that the returned value of
GeomUtils::intersect2dSeg2dSegParametric() was not properly tested.
Now two collinear line segments are not considered an intersection.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/SweepLine.h

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/SweepLine.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/SweepLine.h	2010-01-18 03:49:53 UTC (rev 26068)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/geometry/SweepLine.h	2010-01-18 03:54:15 UTC (rev 26069)
@@ -298,7 +298,7 @@
       if(S->CommonVertex(*currentS, CP))
         continue; // the two edges have a common vertex->no need to check
       
-      if(GeomUtils::intersect2dSeg2dSegParametric(v0, v1, v2, v3, t, u))
+	  if(GeomUtils::intersect2dSeg2dSegParametric(v0, v1, v2, v3, t, u) == GeomUtils::DO_INTERSECT)
       {
         // create the intersection
         Intersection<Segment<T,Point> > * inter = new Intersection<Segment<T,Point> >(S,t,currentS,u);