diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-04-09 17:32:45 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-04-09 17:32:45 +0300 |
| commit | b30a2fe3f4e0414483c8408a080fd56bc1ca5958 (patch) | |
| tree | 59cdaf1150f23fb6cdc1651eca8cab2930a8091e /source | |
| parent | 4cadbb03a8e4f6c6e59b3d2e3b48c6376e9b385b (diff) | |
Fix T44322: Crash when trying to render spotlight halos.
Trying to access rl's from full samples in non-full-OSA context (with uninitialized
sample index even :P ).
Caused by rBd5f1b9c2, probably a copy/paste typo or so.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/render/intern/source/rendercore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index 99611a9c5a8..a634bd9780c 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -413,7 +413,7 @@ static void lamphalo_tile(RenderPart *pa, RenderLayer *rl) } else { fac= ((float)R.osa-totsamp)/(float)R.osa; - pass = RE_RenderLayerGetPass(rlpp[sample], SCE_PASS_COMBINED, R.viewname); + pass = RE_RenderLayerGetPass(rl, SCE_PASS_COMBINED, R.viewname); pass += od * 4; pass[0]+= fac*col[0]; pass[1]+= fac*col[1]; |