diff options
| author | Martin Poirier <theeth@yahoo.com> | 2009-02-24 00:00:42 +0300 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2009-02-24 00:00:42 +0300 |
| commit | 7c830b75f160db4de8c415dcf1c0b3bf554a4821 (patch) | |
| tree | 4892c025ae6bffdb20fb81213ba57f538a4b2e53 /source/blender/blenlib/intern/arithb.c | |
| parent | e25318ebefb4dd34443430ab0b7408d3a6118b3d (diff) | |
| parent | 334da0fa57195af65c2877ee2882714efe5431f9 (diff) | |
merging trunk 17520:19093
Diffstat (limited to 'source/blender/blenlib/intern/arithb.c')
| -rw-r--r-- | source/blender/blenlib/intern/arithb.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c index 783acb9cc97..5f94df6f5eb 100644 --- a/source/blender/blenlib/intern/arithb.c +++ b/source/blender/blenlib/intern/arithb.c @@ -2183,6 +2183,13 @@ void VecMulf(float *v1, float f) v1[2]*= f; } +void VecNegf(float *v1) +{ + v1[0] = -v1[0]; + v1[1] = -v1[1]; + v1[2] = -v1[2]; +} + void VecOrthoBasisf(float *v, float *v1, float *v2) { float f = sqrt(v[0]*v[0] + v[1]*v[1]); @@ -3945,7 +3952,7 @@ int SweepingSphereIntersectsTriangleUV(float p1[3], float p2[3], float radius, f Normalize(nor); /* flip normal */ - if(Inpf(nor,vel)>0.0f) VecMulf(nor,-1.0f); + if(Inpf(nor,vel)>0.0f) VecNegf(nor); a=Inpf(p1,nor)-Inpf(v0,nor); nordotv=Inpf(nor,vel); @@ -4677,7 +4684,7 @@ void tangent_from_uv(float *uv1, float *uv2, float *uv3, float *co1, float *co2, /* check flip */ if ((ct[0]*n[0] + ct[1]*n[1] + ct[2]*n[2]) < 0.0f) - VecMulf(tang, -1.0f); + VecNegf(tang); } /* used for zoom values*/ |