[Bf-blender-cvs] [d425cb0] master: Fix T41408: Diffuse and specular passes were incorrect with combined/color passes disabled

[Sergey Sharybin]

Commit: d425cb06f691a573239e1f31c3394f22cbf6cdd6
Author: Sergey Sharybin
Date:   Tue Aug 12 13:33:23 2014 +0600
Branches: master
https://developer.blender.org/rBd425cb06f691a573239e1f31c3394f22cbf6cdd6

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

===================================================================

M	source/blender/render/intern/source/shadeoutput.c

===================================================================

diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c
index ebf88ef..4c67a32 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];