Revision: 21155
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21155
Author: ton
Date: 2009-06-25 14:32:55 +0200 (Thu, 25 Jun 2009)
Log Message:
-----------
Bugfix, testing venom's lab .blends
Using LightGroups override for material doesn't work for preview
renders. Code didn't correctly return correct light listbase then,
crashing Blender on preview render.
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
2009-06-25 12:30:49 UTC (rev 21154)
+++ trunk/blender/source/blender/render/intern/source/shadeoutput.c
2009-06-25 12:32:55 UTC (rev 21155)
@@ -61,12 +61,14 @@
static ListBase *get_lights(ShadeInput *shi)
{
+ if(R.r.scemode & R_PREVIEWBUTS)
+ return &R.lights;
if(shi->light_override)
return &shi->light_override->gobject;
- else if(shi->mat && shi->mat->group)
+ if(shi->mat && shi->mat->group)
return &shi->mat->group->gobject;
- else
- return &R.lights;
+
+ return &R.lights;
}
#if 0
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
