Revision: 24469
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24469
Author: aligorith
Date: 2009-11-11 02:32:38 +0100 (Wed, 11 Nov 2009)
Log Message:
-----------
Actionzones (i.e. corner widgets for splitting views) were broken after the
math-lib commit. Was caused by functions that got renamed to the same name but
the order of arguments were different.
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/intern/math_geom.c
Modified: trunk/blender/source/blender/blenlib/intern/math_geom.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_geom.c 2009-11-11
00:02:49 UTC (rev 24468)
+++ trunk/blender/source/blender/blenlib/intern/math_geom.c 2009-11-11
01:32:38 UTC (rev 24469)
@@ -337,6 +337,7 @@
#define SIDE_OF_LINE(pa,pb,pp)
((pa[0]-pp[0])*(pb[1]-pp[1]))-((pb[0]-pp[0])*(pa[1]-pp[1]))
/* point in tri */
+// XXX was called IsectPT2Df
int isect_point_tri_v2(float pt[2], float v1[2], float v2[2], float v3[2])
{
if (SIDE_OF_LINE(v1,v2,pt)>=0.0) {
@@ -1074,8 +1075,8 @@
}
}
-#if 0
-int isect_point_tri_v2(float v1[2], float v2[2], float v3[2], float pt[2])
+#if 0 // XXX this version used to be used in isect_point_tri_v2_int() and was
called IsPointInTri2D
+int isect_point_tri_v2(float pt[2], float v1[2], float v2[2], float v3[2])
{
float inp1, inp2, inp3;
@@ -1145,7 +1146,7 @@
p[0]= (float)a;
p[1]= (float)b;
- return isect_point_tri_v2(v1, v2, v3, p);
+ return isect_point_tri_v2(p, v1, v2, v3);
}
static int point_in_slice(float p[3], float v1[3], float l1[3], float l2[3])
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
