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/editors/interface/interface_draw.c | |
parent | eb7bccb39a639683275ed0b80b927cd5eb8264fa (diff) |
quiet -Wdouble-promotion warnings
Diffstat (limited to 'source/blender/editors/interface/interface_draw.c')
-rw-r--r-- | source/blender/editors/interface/interface_draw.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 4bc0963aad4..67030f1aca7 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -1560,11 +1560,11 @@ void ui_draw_but_TRACKPREVIEW(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wc /* draw content of pattern area */ glScissor(ar->winrct.xmin+rect.xmin, ar->winrct.ymin+rect.ymin, scissor[2], scissor[3]); - zoomx= (rect.xmax-rect.xmin) / (scopes->track_preview->x-2.f); - zoomy= (rect.ymax-rect.ymin) / (scopes->track_preview->y-2.f); + zoomx= (rect.xmax-rect.xmin) / (scopes->track_preview->x-2.0f); + zoomy= (rect.ymax-rect.ymin) / (scopes->track_preview->y-2.0f); - off_x= ((int)scopes->track_pos[0]-scopes->track_pos[0]-0.5)*zoomx; - off_y= ((int)scopes->track_pos[1]-scopes->track_pos[1]-0.5)*zoomy; + off_x= ((int)scopes->track_pos[0]-scopes->track_pos[0]-0.5f)*zoomx; + off_y= ((int)scopes->track_pos[1]-scopes->track_pos[1]-0.5f)*zoomy; drawibuf= scale_trackpreview_ibuf(scopes->track_preview, zoomx, zoomy); glaDrawPixelsSafe(off_x+rect.xmin, off_y+rect.ymin, rect.xmax-rect.xmin+1.f-off_x, rect.ymax-rect.ymin+1.f-off_y, drawibuf->x, GL_RGBA, GL_UNSIGNED_BYTE, drawibuf->rect); |