From ad9b1c58f596fd0e0b112f2c9a0953f8da932ae5 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sat, 6 Jan 2007 11:13:07 +0000 Subject: [PATCH] Bugfix #5611 Lamp halo render with option "Layer" crashed. --- source/blender/render/intern/source/shadeoutput.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index 8837b933fa3..de5db379865 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -347,8 +347,11 @@ void renderspothalo(ShadeInput *shi, float *col, float alpha) if(lar->type==LA_SPOT && (lar->mode & LA_HALO) && lar->haint>0) { - if(lar->mode & LA_LAYER) if((lar->lay & shi->vlr->lay)==0) continue; - if((lar->lay & shi->lay)==0) continue; + if(lar->mode & LA_LAYER) + if(shi->vlr && (lar->lay & shi->vlr->lay)==0) + continue; + if((lar->lay & shi->lay)==0) + continue; spothalo(lar, shi, &i); if(i>0.0f) {