diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-01-03 06:18:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-01-03 06:18:48 +0300 |
| commit | a93e2d3603cf25955141df497f497478da71e02f (patch) | |
| tree | 3e5bcac35f913853b7ec59a6d6a34a7477a815f7 /source/blender/render | |
| parent | 5266969546fae7476f44d64353fdfd14a2ecac60 (diff) | |
[#20455] Spotlight halo with deep buffers: render crashes
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/shadeoutput.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index feac12d931f..899ddbe4fb4 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -3630,7 +3630,7 @@ static GroupObject *add_render_lamp(Render *re, Object *ob) } /* set flag for spothalo en initvars */ - if(la->type==LA_SPOT && (la->mode & LA_HALO)) { + if(la->type==LA_SPOT && (la->mode & LA_HALO) && (la->buftype != LA_SHADBUF_DEEP)) { if(la->haint>0.0) { re->flag |= R_LAMPHALO; diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index 958a2e34215..e9386bb0d94 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -354,7 +354,7 @@ void renderspothalo(ShadeInput *shi, float *col, float alpha) lar= go->lampren; if(lar==NULL) continue; - if(lar->type==LA_SPOT && (lar->mode & LA_HALO) && lar->haint>0) { + if(lar->type==LA_SPOT && (lar->mode & LA_HALO) && (lar->buftype != LA_SHADBUF_DEEP) && lar->haint>0) { if(lar->mode & LA_LAYER) if(shi->vlr && (lar->lay & shi->obi->lay)==0) |