[Bf-blender-cvs] [69f071a] blender-v2.72-release: Fix T41957: Shadow color texture mapping was using wrong factor

Sergey Sharybin noreply at git.blender.org
Wed Oct 15 13:08:05 CEST 2014


Commit: 69f071a47dbe9ed0feda9f4caa2a6cc1d11e4d98
Author: Sergey Sharybin
Date:   Tue Oct 7 12:30:23 2014 +0200
Branches: blender-v2.72-release
https://developer.blender.org/rB69f071a47dbe9ed0feda9f4caa2a6cc1d11e4d98

Fix T41957: Shadow color texture mapping was using wrong factor

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

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

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

diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c
index dd14c24..566668b 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);
 			}
 		}
 	}




More information about the Bf-blender-cvs mailing list