[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56044] trunk/blender/source/blender/ python/mathutils/mathutils_geometry.c: correct pyapi function intersect_line_sphere_2d() using 3d vecs when only 2d are needed.

[Campbell Barton]

Revision: 56044
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56044
Author:   campbellbarton
Date:     2013-04-14 11:57:35 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
correct pyapi function intersect_line_sphere_2d() using 3d vecs when only 2d 
are needed.

Modified Paths:
--------------
    trunk/blender/source/blender/python/mathutils/mathutils_geometry.c

Modified: trunk/blender/source/blender/python/mathutils/mathutils_geometry.c
===================================================================
--- trunk/blender/source/blender/python/mathutils/mathutils_geometry.c  
2013-04-14 11:56:11 UTC (rev 56043)
+++ trunk/blender/source/blender/python/mathutils/mathutils_geometry.c  
2013-04-14 11:57:35 UTC (rev 56044)
@@ -734,8 +734,8 @@
        float sphere_radius;
        int clip = TRUE;
 
-       float isect_a[3];
-       float isect_b[3];
+       float isect_a[2];
+       float isect_b[2];
 
        if (!PyArg_ParseTuple(args, "O!O!O!f|i:intersect_line_sphere_2d",
                              &vector_Type, &line_a,
@@ -753,24 +753,24 @@
                return NULL;
        }
        else {
-               short use_a = TRUE;
-               short use_b = TRUE;
+               bool use_a = true;
+               bool use_b = true;
                float lambda;
 
                PyObject *ret = PyTuple_New(2);
 
                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;
+                               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;
                                break;
                        case 2:
-                               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_b, line_a->vec, line_b->vec)) >= 0.0f) && (lambda <= 
1.0f)))) use_b = FALSE;
+                               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_b, line_a->vec, line_b->vec)) >= 0.0f) && (lambda <= 
1.0f)))) use_b = false;
                                break;
                        default:
-                               use_a = FALSE;
-                               use_b = FALSE;
+                               use_a = false;
+                               use_b = false;
                }
 
                if (use_a) { PyTuple_SET_ITEM(ret, 0,  
Vector_CreatePyObject(isect_a, 2, Py_NEW, NULL)); }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs