diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-03 14:04:16 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-03 14:04:16 +0400 |
| commit | 0298d223cc1156df3a32fbb3a97dccf5ddb5ad02 (patch) | |
| tree | 437798c6e1ae0541bd7169072d2c5a5e276a40c7 /source/blender/gpu | |
| parent | 744a3b9cb26a734487264eec3e9e6dacb28daa73 (diff) | |
quiet various warnings, also disable -Wdouble-promotion with cmake since it gives warnings with variable length args.
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 510ae31db51..200b42526f0 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -106,7 +106,7 @@ void GPU_render_text(MTFace *tface, int mode, line_height= MAX4(v1[1], v2[1], v3[1], v4[2]) - MIN4(v1[1], v2[1], v3[1], v4[2]); else line_height= MAX3(v1[1], v2[1], v3[1]) - MIN3(v1[1], v2[1], v3[1]); - line_height *= 1.2; /* could be an option? */ + line_height *= 1.2f; /* could be an option? */ /* end multiline */ @@ -358,7 +358,7 @@ static void gpu_set_blend_mode(GPUBlendMode blendmode) * turn off alpha test in this case */ /* added after 2.45 to clip alpha */ - if(U.glalphaclip == 1.0) { + if(U.glalphaclip == 1.0f) { glDisable(GL_ALPHA_TEST); } else { @@ -1288,8 +1288,8 @@ int GPU_scene_object_lights(Scene *scene, Object *ob, int lay, float viewmat[][4 /* spot lamp */ negate_v3_v3(direction, base->object->obmat[2]); glLightfv(GL_LIGHT0+count, GL_SPOT_DIRECTION, direction); - glLightf(GL_LIGHT0+count, GL_SPOT_CUTOFF, la->spotsize/2.0); - glLightf(GL_LIGHT0+count, GL_SPOT_EXPONENT, 128.0*la->spotblend); + glLightf(GL_LIGHT0+count, GL_SPOT_CUTOFF, la->spotsize/2.0f); + glLightf(GL_LIGHT0+count, GL_SPOT_EXPONENT, 128.0f*la->spotblend); } else glLightf(GL_LIGHT0+count, GL_SPOT_CUTOFF, 180.0); |