Commit: e5ee9d1eff7ee5fea44e59649aead84bdb5a1bc1 Author: Brecht Van Lommel Date: Sun Oct 11 03:29:28 2015 +0200 Branches: blender-v2.76a-release https://developer.blender.org/rBe5ee9d1eff7ee5fea44e59649aead84bdb5a1bc1
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 120930e..0c5941f 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -3055,7 +3055,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); _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
