diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-08-31 15:45:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-31 15:47:14 +0300 |
| commit | a603a3470c1ad18f5ceed3315aaec6cdc5c8e107 (patch) | |
| tree | e1c70d110d870a2c28c18a9115e1eccacd1f36fc /source/blender/blenlib | |
| parent | 06b14aa5f9c961d7bdcf6f959bbb5e517633dc4e (diff) | |
Revert fix for T45849 (part 2, tsk!)
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 328bf55394a..65625db622d 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -1976,6 +1976,7 @@ int isect_line_line_epsilon_v3( d = dot_v3v3(c, ab); div = dot_v3v3(ab, ab); + /* important not to use an epsilon here, see: T45919 */ /* test zero length line */ if (UNLIKELY(div == 0.0f)) { return 0; @@ -2048,8 +2049,9 @@ bool isect_line_line_strict_v3(const float v1[3], const float v2[3], d = dot_v3v3(c, ab); div = dot_v3v3(ab, ab); + /* important not to use an epsilon here, see: T45919 */ /* test zero length line */ - if (UNLIKELY(div <= epsilon)) { + if (UNLIKELY(div == 0.0f)) { return false; } /* test if the two lines are coplanar */ |