diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-08-21 23:37:19 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-08-21 23:37:19 +0400 |
| commit | c5106fd097cb51a8d9b24cb7ed4759b9ea30051f (patch) | |
| tree | 3aaf572d4b808169a4aa76d6e7723e19590fa61e /source/blender/blenlib/intern/math_geom.c | |
| parent | 5b7133448439a510e779209c35aebd4cf38ff637 (diff) | |
| parent | 36f20f162caf83929e6eb07be6b73eb59740ead4 (diff) | |
Merge with trunk r39589
Diffstat (limited to 'source/blender/blenlib/intern/math_geom.c')
| -rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 0c9508efc27..707adc67ca3 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -417,7 +417,7 @@ int isect_line_sphere_v3(const float l1[3], const float l2[3], madd_v3_v3v3fl(r_p1, l1, ldir, mu); return 1; } - else if (i > 0.0) { + else if (i > 0.0f) { const float i_sqrt= sqrt(i); /* avoid calc twice */ /* first intersection */ @@ -471,7 +471,7 @@ int isect_line_sphere_v2(const float l1[2], const float l2[2], madd_v2_v2v2fl(r_p1, l1, ldir, mu); return 1; } - else if (i > 0.0) { + else if (i > 0.0f) { const float i_sqrt= sqrt(i); /* avoid calc twice */ /* first intersection */ @@ -2025,7 +2025,7 @@ void resolve_quad_uv(float uv[2], const float st[2], const float st0[2], const f } if(IS_ZERO(denom)==0) - uv[1]= (float) (( (1-uv[0])*(st0[i]-st[i]) + uv[0]*(st1[i]-st[i]) ) / denom); + uv[1]= (float) (( (1.0f-uv[0])*(st0[i]-st[i]) + uv[0]*(st1[i]-st[i]) ) / denom); } } |