[Bf-blender-cvs] [9a2290a] master: Fix T46826: EXR Compression method set in UI does not always get passed correctly to the actual OpenEXR writing code.

Bastien Montagne noreply at git.blender.org
Fri Nov 20 19:23:37 CET 2015


Commit: 9a2290a30b478f6bf0863796d8129b9fe7e368f1
Author: Bastien Montagne
Date:   Fri Nov 20 19:22:20 2015 +0100
Branches: master
https://developer.blender.org/rB9a2290a30b478f6bf0863796d8129b9fe7e368f1

Fix T46826: EXR Compression method set in UI does not always get passed correctly to the actual OpenEXR writing code.

===================================================================

M	source/blender/blenkernel/intern/image.c

===================================================================

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 5f2629b..f4fce5c 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2212,6 +2212,7 @@ void BKE_imbuf_write_prepare(ImBuf *ibuf, ImageFormatData *imf)
 		ibuf->ftype = IMB_FTYPE_OPENEXR;
 		if (imf->depth == R_IMF_CHAN_DEPTH_16)
 			ibuf->foptions.flag |= OPENEXR_HALF;
+		ibuf->foptions.flag &= ~OPENEXR_COMPRESS;
 		ibuf->foptions.flag |= (imf->exr_codec & OPENEXR_COMPRESS);
 
 		if (!(imf->flag & R_IMF_FLAG_ZBUF))




More information about the Bf-blender-cvs mailing list