From 8cda8abefe31292c3647d7e22f1cefed84b5127a Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Thu, 25 Jun 2009 12:32:55 +0000 Subject: [PATCH] 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. --- source/blender/render/intern/source/shadeoutput.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index 130cda9f107..2fbd93df0ce 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -61,12 +61,14 @@ extern struct Render R; 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