[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14484] trunk/blender/source/blender/ render/intern/source/rendercore.c:

[Brecht Van Lommel]

Revision: 14484
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14484
Author:   blendix
Date:     2008-04-19 23:59:15 +0200 (Sat, 19 Apr 2008)

Log Message:
-----------

Fix for bug #9081: SSS preprocess should not use material or
light overrides, since it works independent of render layers.

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

Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rendercore.c	2008-04-19 21:58:11 UTC (rev 14483)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c	2008-04-19 21:59:15 UTC (rev 14484)
@@ -1447,6 +1447,8 @@
 	rl= rr->layers.first;
 	ssamp.shi[0].passflag |= SCE_PASS_RGBA|SCE_PASS_COMBINED;
 	ssamp.shi[0].combinedflag &= ~(SCE_PASS_SPEC);
+	ssamp.shi[0].mat_override= NULL;
+	ssamp.shi[0].light_override= NULL;
 	lay= ssamp.shi[0].lay;
 
 	/* create the pixelstrs to be used later */