griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T41408: Diffuse and specular passes were incorrect with combined/color passes disabled

Browse Source
This commit is contained in:
Sergey Sharybin
2014-08-12 13:33:23 +06:00
parent eadfddd02a
commit d425cb06f6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/render/intern/source/shadeoutput.c
View File

@@ -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];