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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-07-04 12:13:27 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-07-04 12:13:27 +0400
commitaa1668c6f8a70e41b97b67f31647dbec382e19f7 (patch)
tree1691c4e6b1ac3868ebba46760354337b653f06d7 /source
parent0e0eba9f79b122eeef613fbd3733b339a95094a4 (diff)
fix for own error in intersect_line_sphere_2d(), using 3d function on 2d vectors
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenlib/intern/math_geom.c2
-rw-r--r--source/blender/python/generic/mathutils_geometry.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index 9d945e9baa3..fc329fe1bf1 100644
--- 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_v3v3(ldir, ldir);
+ const float a= dot_v2v2(ldir, ldir);
const float b= 2.0f *
(ldir[0] * (l1[0] - sp[0]) +
diff --git a/source/blender/python/generic/mathutils_geometry.c b/source/blender/python/generic/mathutils_geometry.c
index 55c1e69d558..26844a5003d 100644
--- a/source/blender/python/generic/mathutils_geometry.c
+++ b/source/blender/python/generic/mathutils_geometry.c
@@ -680,7 +680,7 @@ static PyObject *M_Geometry_intersect_line_sphere_2d(PyObject *UNUSED(self), PyO
PyObject *ret= PyTuple_New(2);
- switch(isect_line_sphere_v3(line_a->vec, line_b->vec, sphere_co->vec, sphere_radius, isect_a, isect_b)) {
+ switch(isect_line_sphere_v2(line_a->vec, line_b->vec, sphere_co->vec, sphere_radius, isect_a, isect_b)) {
case 1:
if(!(!clip || (((lambda= line_point_factor_v2(isect_a, line_a->vec, line_b->vec)) >= 0.0f) && (lambda <= 1.0f)))) use_a= FALSE;
use_b= FALSE;