diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-24 00:26:37 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-24 00:26:37 +0400 |
| commit | 5df049f390047d6cf3badca0277b2724979db515 (patch) | |
| tree | 1506a8edb4f7b46b3681728403f578758f07393d | |
| parent | 217a7d1829a36343792ef4114e5e032b22bac8af (diff) | |
fix [#29683] OpenEXR Output Appears to be broken
own error with moving image settings.
| -rw-r--r-- | source/blender/blenfont/intern/blf_translation.c | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenfont/intern/blf_translation.c b/source/blender/blenfont/intern/blf_translation.c index 1d82abcf32d..0ddb6549717 100644 --- a/source/blender/blenfont/intern/blf_translation.c +++ b/source/blender/blenfont/intern/blf_translation.c @@ -131,6 +131,7 @@ const char *BLF_pgettext(const char *context, const char *message) return translation; #else + (void)context; return message; #endif } diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 25ff7b5fa04..354a5265f90 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -1544,7 +1544,7 @@ int BKE_write_ibuf(ImBuf *ibuf, const char *name, ImageFormatData *imf) ibuf->ftype= OPENEXR; if(imf->depth == R_IMF_CHAN_DEPTH_16) ibuf->ftype |= OPENEXR_HALF; - ibuf->ftype |= (quality & OPENEXR_COMPRESS); + ibuf->ftype |= (imf->exr_codec & OPENEXR_COMPRESS); if(!(imf->flag & R_IMF_FLAG_ZBUF)) ibuf->zbuf_float = NULL; /* signal for exr saving */ |