diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-02 06:08:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-02 06:08:33 +0400 |
| commit | 69bd72c3b6aa1fdaab0c1232a6ba1e3e4c9029fa (patch) | |
| tree | bba65f8473ee4c3c2b6650f567964955b8611940 /source/blender/render/intern/include | |
| parent | fb994b3c857bdf3a7313da046580c0fb76e8b620 (diff) | |
quiet gcc float -> double promotion warnings.
Diffstat (limited to 'source/blender/render/intern/include')
| -rw-r--r-- | source/blender/render/intern/include/texture.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h index 2aa8c37e9a4..a63c4f7f253 100644 --- a/source/blender/render/intern/include/texture.h +++ b/source/blender/render/intern/include/texture.h @@ -37,15 +37,15 @@ #ifndef TEXTURE_EXT_H #define TEXTURE_EXT_H -#define BRICONT texres->tin= (texres->tin-0.5)*tex->contrast+tex->bright-0.5; \ -if(texres->tin<0.0) texres->tin= 0.0; else if(texres->tin>1.0) texres->tin= 1.0; +#define BRICONT texres->tin= (texres->tin-0.5f)*tex->contrast+tex->bright-0.5f; \ +if(texres->tin<0.0f) texres->tin= 0.0f; else if(texres->tin>1.0f) texres->tin= 1.0f; -#define BRICONTRGB texres->tr= tex->rfac*((texres->tr-0.5)*tex->contrast+tex->bright-0.5); \ -if(texres->tr<0.0) texres->tr= 0.0; \ -texres->tg= tex->gfac*((texres->tg-0.5)*tex->contrast+tex->bright-0.5); \ -if(texres->tg<0.0) texres->tg= 0.0; \ -texres->tb= tex->bfac*((texres->tb-0.5)*tex->contrast+tex->bright-0.5); \ -if(texres->tb<0.0) texres->tb= 0.0; \ +#define BRICONTRGB texres->tr= tex->rfac*((texres->tr-0.5f)*tex->contrast+tex->bright-0.5f); \ +if(texres->tr<0.0f) texres->tr= 0.0f; \ +texres->tg= tex->gfac*((texres->tg-0.5f)*tex->contrast+tex->bright-0.5f); \ +if(texres->tg<0.0f) texres->tg= 0.0f; \ +texres->tb= tex->bfac*((texres->tb-0.5f)*tex->contrast+tex->bright-0.5f); \ +if(texres->tb<0.0f) texres->tb= 0.0f; \ if(tex->saturation != 1.0f) { \ float _hsv[3]; \ rgb_to_hsv(texres->tr, texres->tg, texres->tb, _hsv, _hsv+1, _hsv+2); \ @@ -53,7 +53,7 @@ if(tex->saturation != 1.0f) { \ hsv_to_rgb(_hsv[0], _hsv[1], _hsv[2], &texres->tr, &texres->tg, &texres->tb); \ } \ -#define RGBTOBW(r,g,b) ( r*0.35 + g*0.45 + b*0.2 ) /* keep this in sync with gpu_shader_material.glsl:rgbtobw */ +#define RGBTOBW(r,g,b) ( r*0.35f + g*0.45f + b*0.2f ) /* keep this in sync with gpu_shader_material.glsl:rgbtobw */ struct HaloRen; struct ShadeInput; |