Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-01-18 06:54:15 +0300
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-01-18 06:54:15 +0300
commit9802fdf4c29662db67f712882ddbfc780a695531 (patch)
tree7a0094a8fcaf3648aef06aa68ffdb594644e4100 /source/blender/freestyle/intern/geometry
parentdd5e7258cd7334213aec3e9f46bf576132e97050 (diff)
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.
Diffstat (limited to 'source/blender/freestyle/intern/geometry')
-rwxr-xr-xsource/blender/freestyle/intern/geometry/SweepLine.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/geometry/SweepLine.h b/source/blender/freestyle/intern/geometry/SweepLine.h
index e3fb4ad8c0c..386ba3a7388 100755
--- a/source/blender/freestyle/intern/geometry/SweepLine.h
+++ b/source/blender/freestyle/intern/geometry/SweepLine.h
@@ -298,7 +298,7 @@ public:
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);