[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38078] trunk/blender/source/blender: fix for own error in intersect_line_sphere_2d(), using 3d function on 2d vectors

[Campbell Barton]

Revision: 38078
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38078
Author:   campbellbarton
Date:     2011-07-04 08:13:27 +0000 (Mon, 04 Jul 2011)
Log Message:
-----------
fix for own error in intersect_line_sphere_2d(), using 3d function on 2d vectors

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/intern/math_geom.c
    trunk/blender/source/blender/python/generic/mathutils_geometry.c

Modified: trunk/blender/source/blender/blenlib/intern/math_geom.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_geom.c	2011-07-04 05:23:36 UTC (rev 38077)
+++ trunk/blender/source/blender/blenlib/intern/math_geom.c	2011-07-04 08:13:27 UTC (rev 38078)
@@ -430,7 +430,7 @@
 	    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]) +

Modified: trunk/blender/source/blender/python/generic/mathutils_geometry.c
===================================================================
--- trunk/blender/source/blender/python/generic/mathutils_geometry.c	2011-07-04 05:23:36 UTC (rev 38077)
+++ trunk/blender/source/blender/python/generic/mathutils_geometry.c	2011-07-04 08:13:27 UTC (rev 38078)
@@ -680,7 +680,7 @@
 
 		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;