griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Joshua Leung
2009-11-11 01:32:38 +00:00
parent 9256408612
commit 0807bc176a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -337,6 +337,7 @@ static short IsectLLPt2Df(float x0,float y0,float x1,float y1,
#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 @@ void isect_point_face_uv_v2(int isquad, float v0[2], float v1[2], float v2[2], f
}
}
#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 @@ int isect_point_tri_v2_int(int x1, int y1, int x2, int y2, int a, int b)
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])