[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43030] trunk/blender/source/blender/ render/intern/source/shadeoutput.c: Fix: Material "Vertex Color Light" option didn't apply vertex alpha.

[Miika Hamalainen]

Revision: 43030
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43030
Author:   miikah
Date:     2011-12-31 10:46:21 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
Fix: Material "Vertex Color Light" option didn't apply vertex alpha.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/shadeoutput.c

Modified: trunk/blender/source/blender/render/intern/source/shadeoutput.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/shadeoutput.c	2011-12-31 10:28:36 UTC (rev 43029)
+++ trunk/blender/source/blender/render/intern/source/shadeoutput.c	2011-12-31 10:46:21 UTC (rev 43030)
@@ -1712,9 +1712,9 @@
 	}
 
 	if( (ma->mode & (MA_VERTEXCOL|MA_VERTEXCOLP))== MA_VERTEXCOL ) {	// vertexcolor light
-		shr->emit[0]= shi->r*(shi->emit+shi->vcol[0]);
-		shr->emit[1]= shi->g*(shi->emit+shi->vcol[1]);
-		shr->emit[2]= shi->b*(shi->emit+shi->vcol[2]);
+		shr->emit[0]= shi->r*(shi->emit+shi->vcol[0]*shi->vcol[3]);
+		shr->emit[1]= shi->g*(shi->emit+shi->vcol[1]*shi->vcol[3]);
+		shr->emit[2]= shi->b*(shi->emit+shi->vcol[2]*shi->vcol[3]);
 	}
 	else {
 		shr->emit[0]= shi->r*shi->emit;