diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-02-12 02:26:22 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-02-12 02:26:22 +0300 |
| commit | a6a5ce4f7b5c2bde71715b11052d2ce30a34cb6d (patch) | |
| tree | 12a40adc00acaa2a2e20795d8bf5dca134feb5ae /source/blender/freestyle/intern/geometry/GeomUtils.cpp | |
| parent | ed266e868cee7e922f028227ee22492d7e830253 (diff) | |
More consolidation of the view map creation.
Made an attempt to fix "2D intersection out of range" warnings.
These warnings may cause "3D intersection out of range" warnings,
which often lead to a crash.
Diffstat (limited to 'source/blender/freestyle/intern/geometry/GeomUtils.cpp')
| -rwxr-xr-x | source/blender/freestyle/intern/geometry/GeomUtils.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/geometry/GeomUtils.cpp b/source/blender/freestyle/intern/geometry/GeomUtils.cpp index 88aafeed598..2169bce0364 100755 --- a/source/blender/freestyle/intern/geometry/GeomUtils.cpp +++ b/source/blender/freestyle/intern/geometry/GeomUtils.cpp @@ -152,7 +152,8 @@ namespace GeomUtils { const Vec2r& p3, const Vec2r& p4, real& t, - real& u) { + real& u, + real epsilon) { real a1, a2, b1, b2, c1, c2; // Coefficients of line eqns real r1, r2, r3, r4; // 'Sign' values real denom, num; // Intermediate values @@ -189,7 +190,7 @@ namespace GeomUtils { // Line segments intersect: compute intersection point. denom = a1 * b2 - a2 * b1; - if (fabs(denom) < M_EPSILON) + if (fabs(denom) < epsilon) return (COLINEAR); real d1, d2, e1; |