diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-07 14:30:23 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-15 15:06:09 +0400 |
| commit | 69f071a47dbe9ed0feda9f4caa2a6cc1d11e4d98 (patch) | |
| tree | 6a23464330a3b811e142af84071ad109a7f727cd /source/blender | |
| parent | 717530d2f591cc601e2df599721fcf290e4c550b (diff) | |
Fix T41957: Shadow color texture mapping was using wrong factor
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/render/intern/source/render_texture.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index dd14c2495e8..566668bdda5 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -3396,8 +3396,11 @@ void do_lamp_tex(LampRen *la, const float lavec[3], ShadeInput *shi, float col_r col[0]= texres.tr*la->energy; col[1]= texres.tg*la->energy; col[2]= texres.tb*la->energy; - - texture_rgb_blend(col_r, col, col_r, texres.tin, mtex->colfac, mtex->blendtype); + + if (effect & LA_SHAD_TEX) + texture_rgb_blend(col_r, col, col_r, texres.tin, mtex->shadowfac, mtex->blendtype); + else + texture_rgb_blend(col_r, col, col_r, texres.tin, mtex->colfac, mtex->blendtype); } } } |