diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 16:00:08 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 16:00:08 +0400 |
| commit | 094c9799f9926ae37515a1fe0380403ce3298a77 (patch) | |
| tree | 780f06d65010a80ae7d3c67000af00db89d11a32 /source/blender/gpu/intern/gpu_draw.c | |
| parent | eb7bccb39a639683275ed0b80b927cd5eb8264fa (diff) | |
quiet -Wdouble-promotion warnings
Diffstat (limited to 'source/blender/gpu/intern/gpu_draw.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index d08d7cf2ead..3981e9fac02 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -775,7 +775,7 @@ int GPU_update_image_time(Image *ima, double time) if (ima->lastupdate<0) ima->lastupdate = 0; - if (ima->lastupdate>time) + if (ima->lastupdate > (float)time) ima->lastupdate=(float)time; if(ima->tpageflag & IMA_TWINANIM) { @@ -783,7 +783,7 @@ int GPU_update_image_time(Image *ima, double time) /* check: is the bindcode not in the array? Then free. (still to do) */ - diff = (float)(time-ima->lastupdate); + diff = (float)((float)time - ima->lastupdate); inc = (int)(diff*(float)ima->animspeed); ima->lastupdate+=((float)inc/(float)ima->animspeed); |