diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-07 17:53:56 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-07 17:56:58 +0300 |
| commit | 9927849708ace2657de759fc9b72053b13be9576 (patch) | |
| tree | 1fc1d7c0d57237c6d93674851be53b1d6214ed04 /source/blender/render | |
| parent | b79a33e2d4e7610d3ea4fe4c98486bb0c594f731 (diff) | |
Fix T44984: wrong texture clamping when applying saturation > 1.0
Applying saturation > 1.0 in HSV space easily leads to negative values in RGB space,
so we have to clamp again...
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/include/texture.h | 5 | ||||
| -rw-r--r-- | source/blender/render/intern/source/render_texture.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h index ebc83984306..ed161e186b8 100644 --- a/source/blender/render/intern/include/texture.h +++ b/source/blender/render/intern/include/texture.h @@ -56,6 +56,11 @@ _hsv[1] *= tex->saturation; \ hsv_to_rgb(_hsv[0], _hsv[1], _hsv[2], \ &texres->tr, &texres->tg, &texres->tb); \ + if ((tex->saturation > 1.0f) && !(tex->flag & TEX_NO_CLAMP)) { \ + if (texres->tr < 0.0f) texres->tr= 0.0f; \ + if (texres->tg < 0.0f) texres->tg= 0.0f; \ + if (texres->tb < 0.0f) texres->tb= 0.0f; \ + } \ } \ struct HaloRen; diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index c6a80c822a3..6acdde6af9c 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -2431,7 +2431,7 @@ void do_material_tex(ShadeInput *shi, Render *re) BKE_image_pool_release_ibuf(ima, ibuf, re->pool); } - + if (mtex->mapto & MAP_COL) { float colfac= mtex->colfac*stencilTin; texture_rgb_blend(&shi->r, tcol, &shi->r, texres.tin, colfac, mtex->blendtype); |