archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix for own error in intersect_line_sphere_2d(), using 3d function on 2d vectors

Browse Source
This commit is contained in:
Campbell Barton
2011-07-04 08:13:27 +00:00
parent 0e0eba9f79
commit aa1668c6f8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenlib/intern/math_geom.c
View File

@@ -430,7 +430,7 @@ int isect_line_sphere_v2(const float l1[2], const float l2[2],
l2[1] - l1[1] l2[1] - l1[1]
}; };
const float a= dot_v3v3(ldir, ldir); const float a= dot_v2v2(ldir, ldir);
const float b= 2.0f * const float b= 2.0f *
(ldir[0] * (l1[0] - sp[0]) + (ldir[0] * (l1[0] - sp[0]) +

2
source/blender/python/generic/mathutils_geometry.c
View File

@@ -680,7 +680,7 @@ static PyObject *M_Geometry_intersect_line_sphere_2d(PyObject *UNUSED(self), PyO
PyObject *ret= PyTuple_New(2); 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: 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; 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; use_b= FALSE;