projects
/
blender-staging.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
svn merge -r38000:38200 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git]
/
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 adacf916fc16c5b2d0e24932b4ac5f0ef750233b..993af3cd794e2d3e736136d9e61636916da2d204 100644
(file)
--- a/
source/blender/blenlib/intern/math_geom.c
+++ b/
source/blender/blenlib/intern/math_geom.c
@@
-430,7
+430,7
@@
int isect_line_sphere_v2(const float l1[2], const float l2[2],
l2[1] - l1[1]
};
- const float a= dot_v
3v3
(ldir, ldir);
+ const float a= dot_v
2v2
(ldir, ldir);
const float b= 2.0f *
(ldir[0] * (l1[0] - sp[0]) +