diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-08-19 20:21:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-19 20:21:29 +0400 |
commit | 3a81f23e0975ea87ade780965462ad5b15b39d95 (patch) | |
tree | c0dd7aa326b81598626f6c248bf71063187c715b /source/blender/blenlib/intern/math_geom.c | |
parent | 2c1182664cb65e760742ed43fa840cd241d74b4a (diff) |
warning cleanup for -Wdouble-promotion
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 fc329fe1bf1..5b5de3ab3b6 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -402,7 +402,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 */ @@ -456,7 +456,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 */ @@ -2010,7 +2010,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); } } |