diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-10-11 04:29:28 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-10-15 02:58:33 +0300 |
| commit | 12c705ec86b65ef224c43a5c3e99d4a8d63aeb8f (patch) | |
| tree | 2964c49483e075089bf0b9c50e46956c9f2de95c /source/blender | |
| parent | 8191066c0b6d17936f088baa6a549ee83e7b0db0 (diff) | |
Fix related to T46223: memory leak when loading multilayer multiview images.
Differential Revision: https://developer.blender.org/D1549
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); |