[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13601] trunk/blender/source/blender/ render/intern/source/shadeoutput.c: * fix: "only shadow" lamps still lit materials with "shadow" turned off.

[Matt Ebb]

Revision: 13601
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13601
Author:   broken
Date:     2008-02-07 07:00:08 +0100 (Thu, 07 Feb 2008)

Log Message:
-----------
* fix: "only shadow" lamps still lit materials with "shadow" turned off. Now, they have no effect.

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	2008-02-07 03:31:45 UTC (rev 13600)
+++ trunk/blender/source/blender/render/intern/source/shadeoutput.c	2008-02-07 06:00:08 UTC (rev 13601)
@@ -1186,8 +1186,11 @@
 	vn= shi->vn;
 	view= shi->view;
 	
+	
 	if (lar->energy == 0.0) return;
-	
+	/* only shadow lamps shouldn't affect shadow-less materials at all */
+	if ((lar->mode & LA_ONLYSHADOW) && (!(ma->mode & MA_SHADOW) || !(R.r.mode & R_SHADOW)))
+		return;
 	/* optimisation, don't render fully black lamps */
 	if (!(lar->mode & LA_TEXTURE) && (lar->r + lar->g + lar->b == 0.0f))
 		return;