[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42848] trunk/blender/source/blender: fix [#29683] OpenEXR Output Appears to be broken

[Campbell Barton]

Revision: 42848
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42848
Author:   campbellbarton
Date:     2011-12-23 20:26:37 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
fix [#29683] OpenEXR Output Appears to be broken

own error with moving image settings.

Modified Paths:
--------------
    trunk/blender/source/blender/blenfont/intern/blf_translation.c
    trunk/blender/source/blender/blenkernel/intern/image.c

Modified: trunk/blender/source/blender/blenfont/intern/blf_translation.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_translation.c	2011-12-23 18:53:20 UTC (rev 42847)
+++ trunk/blender/source/blender/blenfont/intern/blf_translation.c	2011-12-23 20:26:37 UTC (rev 42848)
@@ -131,6 +131,7 @@
 
 	return translation;
 #else
+	(void)context;
 	return message;
 #endif
 }

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2011-12-23 18:53:20 UTC (rev 42847)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2011-12-23 20:26:37 UTC (rev 42848)
@@ -1544,7 +1544,7 @@
 		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 */