From 12c705ec86b65ef224c43a5c3e99d4a8d63aeb8f Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 11 Oct 2015 03:29:28 +0200 Subject: Fix related to T46223: memory leak when loading multilayer multiview images. Differential Revision: https://developer.blender.org/D1549 --- source/blender/blenkernel/intern/image.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index f451149c948..875347b39ec 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -3064,7 +3064,9 @@ static void image_create_multilayer(Image *ima, ImBuf *ibuf, int framenr) const char *colorspace = ima->colorspace_settings.name; bool predivide = (ima->alpha_mode == IMA_ALPHA_PREMUL); - ima->rr = RE_MultilayerConvert(ibuf->userdata, colorspace, predivide, ibuf->x, ibuf->y); + /* only load rr once for multiview */ + if (!ima->rr) + ima->rr = RE_MultilayerConvert(ibuf->userdata, colorspace, predivide, ibuf->x, ibuf->y); IMB_exr_close(ibuf->userdata); -- cgit v1.2.3