diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-07-20 14:41:08 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-07-20 14:41:08 +0400 |
commit | 75410037fd0d5ec81ef24c70789b9a684ca86f3f (patch) | |
tree | 2dd932c031fcfb729688e28b701f843cd5487593 /source/blender/blenlib | |
parent | ef9357365c057e88d79c0701604cb2175d030520 (diff) |
- correct some spelling errors.
- remove FreeCamera struct (wasnt used)
- remove world color alpha values (not used anywhre).
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 16 | ||||
-rw-r--r-- | source/blender/blenlib/intern/scanfill.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index e8fb922ce4d..4d1911e8be8 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -317,7 +317,7 @@ static short IsectLLPt2Df(float x0,float y0,float x1,float y1, return -1; /*m2 = (float) 1e+10;*/ // close enough to infinity if (fabs(m1-m2) < 0.000001) - return -1; /* paralelle lines */ + return -1; /* parallel lines */ // compute constants @@ -993,14 +993,14 @@ void isect_point_quad_uv_v2(float v0[2], float v1[2], float v2[2], float v3[2], { float x0,y0, x1,y1, wtot, v2d[2], w1, w2; - /* used for paralelle lines */ + /* used for parallel lines */ float pt3d[3], l1[3], l2[3], pt_on_line[3]; /* compute 2 edges of the quad intersection point */ if (IsectLLPt2Df(v0[0],v0[1],v1[0],v1[1], v2[0],v2[1],v3[0],v3[1], &x0,&y0) == 1) { /* the intersection point between the quad-edge intersection and the point in the quad we want the uv's for */ /* should never be paralle !! */ - /*printf("\tnot paralelle 1\n");*/ + /*printf("\tnot parallel 1\n");*/ IsectLLPt2Df(pt[0],pt[1],x0,y0, v0[0],v0[1],v3[0],v3[1], &x1,&y1); /* Get the weights from the new intersection point, to each edge */ @@ -1016,8 +1016,8 @@ void isect_point_quad_uv_v2(float v0[2], float v1[2], float v2[2], float v3[2], /*w2 = w2/wtot;*/ uv[0] = w1/wtot; } else { - /* lines are paralelle, lambda_cp_line_ex is 3d grrr */ - /*printf("\tparalelle1\n");*/ + /* lines are parallel, lambda_cp_line_ex is 3d grrr */ + /*printf("\tparallel1\n");*/ pt3d[0] = pt[0]; pt3d[1] = pt[1]; pt3d[2] = l1[2] = l2[2] = 0.0f; @@ -1043,7 +1043,7 @@ void isect_point_quad_uv_v2(float v0[2], float v1[2], float v2[2], float v3[2], if (IsectLLPt2Df(v0[0],v0[1],v3[0],v3[1], v1[0],v1[1],v2[0],v2[1], &x0,&y0) == 1) { /* was v0,v1 v2,v3 now v0,v3 v1,v2*/ /* never paralle if above was not */ - /*printf("\tnot paralelle2\n");*/ + /*printf("\tnot parallel2\n");*/ IsectLLPt2Df(pt[0],pt[1],x0,y0, v0[0],v0[1],v1[0],v1[1], &x1,&y1);/* was v0,v3 now v0,v1*/ v2d[0] = x1-v0[0]; @@ -1056,8 +1056,8 @@ void isect_point_quad_uv_v2(float v0[2], float v1[2], float v2[2], float v3[2], wtot = w1+w2; uv[1] = w1/wtot; } else { - /* lines are paralelle, lambda_cp_line_ex is 3d grrr */ - /*printf("\tparalelle2\n");*/ + /* lines are parallel, lambda_cp_line_ex is 3d grrr */ + /*printf("\tparallel2\n");*/ pt3d[0] = pt[0]; pt3d[1] = pt[1]; pt3d[2] = l1[2] = l2[2] = 0.0f; diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c index 92a50ac06c7..7896ebdd263 100644 --- a/source/blender/blenlib/intern/scanfill.c +++ b/source/blender/blenlib/intern/scanfill.c @@ -138,7 +138,7 @@ struct mem_elements { static void *new_mem_element(int size) { int blocksize= 16384; - static int offs= 0; /* the current free adress */ + static int offs= 0; /* the current free address */ static struct mem_elements *cur= 0; static ListBase lb= {0, 0}; void *adr; |