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/space_view3d/drawobject.c | |
parent | eb7bccb39a639683275ed0b80b927cd5eb8264fa (diff) |
quiet -Wdouble-promotion warnings
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index d66197549d9..21fcc067764 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -1479,7 +1479,7 @@ static void draw_viewport_reconstruction(Scene *scene, Base *base, View3D *v3d, glPushMatrix(); glTranslatef(track->bundle_pos[0], track->bundle_pos[1], track->bundle_pos[2]); - glScalef(v3d->bundle_size/0.05, v3d->bundle_size/0.05, v3d->bundle_size/0.05); + glScalef(v3d->bundle_size/0.05f, v3d->bundle_size/0.05f, v3d->bundle_size/0.05f); if(v3d->drawtype==OB_WIRE) { glDisable(GL_LIGHTING); @@ -1720,8 +1720,8 @@ static void drawspeaker(Scene *UNUSED(scene), View3D *UNUSED(v3d), RegionView3D glBegin(GL_LINE_LOOP); for(i = 0; i < 16; i++) { - vec[0] = cosf(M_PI * i / 8.0f) * (j == 0 ? 0.5f : 0.25f); - vec[1] = sinf(M_PI * i / 8.0f) * (j == 0 ? 0.5f : 0.25f); + vec[0] = cosf((float)M_PI * i / 8.0f) * (j == 0 ? 0.5f : 0.25f); + vec[1] = sinf((float)M_PI * i / 8.0f) * (j == 0 ? 0.5f : 0.25f); glVertex3fv(vec); } glEnd(); |