diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-08-12 11:33:23 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-08-12 11:45:55 +0400 |
| commit | d425cb06f691a573239e1f31c3394f22cbf6cdd6 (patch) | |
| tree | 19501e084ae90edf61f8fd6a4933e8f5cae8e679 | |
| parent | eadfddd02a528f1c5450d3795905dbdf669a0062 (diff) | |
Fix T41408: Diffuse and specular passes were incorrect with combined/color passes disabled
| -rw-r--r-- | source/blender/render/intern/source/shadeoutput.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index ebf88efb50b..4c67a320dd0 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -1723,7 +1723,7 @@ void shade_lamp_loop(ShadeInput *shi, ShadeResult *shr) shi->refcol[0]= shi->refcol[1]= shi->refcol[2]= shi->refcol[3]= 0.0f; /* material color itself */ - if (passflag & (SCE_PASS_COMBINED|SCE_PASS_RGBA)) { + if (passflag & (SCE_PASS_COMBINED|SCE_PASS_RGBA|SCE_PASS_DIFFUSE|SCE_PASS_SPEC)) { if (ma->mode & (MA_FACETEXTURE)) { shi->r= shi->vcol[0]; shi->g= shi->vcol[1]; |