From b30a2fe3f4e0414483c8408a080fd56bc1ca5958 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 9 Apr 2015 16:32:45 +0200 Subject: [PATCH] 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. --- source/blender/render/intern/source/rendercore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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];