[Bf-blender-cvs] [a603a34] master: Revert fix for T45849 (part 2, tsk!)
Campbell Barton
noreply at git.blender.org
Mon Aug 31 14:52:16 CEST 2015
Commit: a603a3470c1ad18f5ceed3315aaec6cdc5c8e107
Author: Campbell Barton
Date: Mon Aug 31 22:45:04 2015 +1000
Branches: master
https://developer.blender.org/rBa603a3470c1ad18f5ceed3315aaec6cdc5c8e107
Revert fix for T45849 (part 2, tsk!)
===================================================================
M source/blender/blenlib/intern/math_geom.c
===================================================================
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index 328bf55..65625db 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 */
More information about the Bf-blender-cvs
mailing list