[Bf-blender-cvs] [12c705e] master: Fix related to T46223: memory leak when loading multilayer multiview images.
Brecht Van Lommel
noreply at git.blender.org
Thu Oct 15 02:03:14 CEST 2015
Commit: 12c705ec86b65ef224c43a5c3e99d4a8d63aeb8f
Author: Brecht Van Lommel
Date: Sun Oct 11 03:29:28 2015 +0200
Branches: master
https://developer.blender.org/rB12c705ec86b65ef224c43a5c3e99d4a8d63aeb8f
Fix related to T46223: memory leak when loading multilayer multiview images.
Differential Revision: https://developer.blender.org/D1549
===================================================================
M source/blender/blenkernel/intern/image.c
===================================================================
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index f451149..875347b 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);
More information about the Bf-blender-cvs
mailing list