[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57849] trunk/blender/source/blender/ render/intern/source/shadeoutput.c: Fix: blender internal transparent shadows were not influenced by object color alpha .

[Brecht Van Lommel]

Revision: 57849
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57849
Author:   blendix
Date:     2013-06-28 15:00:05 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
Fix: blender internal transparent shadows were not influenced by object color 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	2013-06-28 14:15:14 UTC (rev 57848)
+++ trunk/blender/source/blender/render/intern/source/shadeoutput.c	2013-06-28 15:00:05 UTC (rev 57849)
@@ -924,6 +924,19 @@
 	shr->diff[1]= shi->g;
 	shr->diff[2]= shi->b;
 	shr->alpha= shi->alpha;
+
+	/* modulate by the object color */
+	if ((ma->shade_flag & MA_OBCOLOR) && shi->obr->ob) {
+		float obcol[4];
+
+		copy_v4_v4(obcol, shi->obr->ob->col);
+		CLAMP(obcol[3], 0.0f, 1.0f);
+
+		shr->diff[0] *= obcol[0];
+		shr->diff[1] *= obcol[1];
+		shr->diff[2] *= obcol[2];
+		if (shi->mode & MA_TRANSP) shr->alpha *= obcol[3];
+	}
 }
 
 /* ramp for at end of shade */