Orange branch: OpenEXR finally in Blender!

Credits go to Gernot Ziegler, who originally coded EXR support, and to
Austin  Benesh for bringing it further. Kent Mein provided a lot of code
for integrating float buffers in Blender imbuf and ImBuf API cleanup,
and provided Make and Scons and static linking.

At this moment; the EXR libraries are a *dependency*, so you cannot get
the Orange branch compiled without having OpenEXR installed. Get the
(precompiled or sources) stuff from www.openexr.com. Current default is
that the headers and lib resides in /user/local/

Several changes/additions/fixes were added:

- EXR code only supported 'half' format (16 bits per channel). I've added
  float writing, but for reading it I need tomorrow. :)
- Quite some clumsy copying of data happened in EXR code.
- cleaned up the api calls already a bit, preparing for more advanced
  support
- Zbuffers were saved 16 bits, now 32 bits
- automatic adding of .exr extensions went wrong

Imbuf:

- added proper imbuf->flags and imbuf->mall support for float buffers, it
  was created for *each* imbuf. :)
- found bugs for float buffers in scaling and flipping. Code there will
  need more checks still
- imbuf also needs to be verified to behave properly when no 32 bits
  rect exists (for saving for example)

TODO:

- support internal float images for textures, backbuf, AO probes, and
  display in Image window

Hope this commit won't screwup syncing with bf-blender... :/

1 files changed, 11 insertions, 12 deletions

diff --git a/source/blender/src/writeimage.c b/source/blender/src/writeimage.c
index f386ea3ecf0..4497ed51e81 100644
--- a/source/blender/src/writeimage.c
+++ b/source/blender/src/writeimage.c
@@ -63,6 +63,11 @@ int BIF_write_ibuf(ImBuf *ibuf, char *name)
 	else if ((G.have_libtiff) && (G.scene->r.imtype==R_TIFF)) {
 		ibuf->ftype= TIF;
 	}
+#ifdef WITH_OPENEXR
+	else if (G.scene->r.imtype==R_OPENEXR) {
+		ibuf->ftype= OPENEXR;
+	}
+#endif
 	else if ((G.scene->r.imtype==R_TARGA) || (G.scene->r.imtype==R_PNG)) {
 		// fall back to Targa if PNG writing is not supported
 		ibuf->ftype= TGA;
@@ -105,18 +110,12 @@ void BIF_save_envmap(EnvMap *env, char *str)
 	dx= env->cube[0]->ibuf->x;
 	ibuf= IMB_allocImBuf(3*dx, 2*dx, 24, IB_rect, 0);
 	
-	IMB_rectop(ibuf, env->cube[0]->ibuf, 
-			0, 0, 0, 0, dx, dx, IMB_rectcpy, 0);
-	IMB_rectop(ibuf, env->cube[1]->ibuf, 
-			dx, 0, 0, 0, dx, dx, IMB_rectcpy, 0);
-	IMB_rectop(ibuf, env->cube[2]->ibuf, 
-			2*dx, 0, 0, 0, dx, dx, IMB_rectcpy, 0);
-	IMB_rectop(ibuf, env->cube[3]->ibuf, 
-			0, dx, 0, 0, dx, dx, IMB_rectcpy, 0);
-	IMB_rectop(ibuf, env->cube[4]->ibuf, 
-			dx, dx, 0, 0, dx, dx, IMB_rectcpy, 0);
-	IMB_rectop(ibuf, env->cube[5]->ibuf, 
-			2*dx, dx, 0, 0, dx, dx, IMB_rectcpy, 0);
+	IMB_rectcpy(ibuf, env->cube[0]->ibuf, 0, 0, 0, 0, dx, dx);
+	IMB_rectcpy(ibuf, env->cube[1]->ibuf, dx, 0, 0, 0, dx, dx);
+	IMB_rectcpy(ibuf, env->cube[2]->ibuf, 2*dx, 0, 0, 0, dx, dx);
+	IMB_rectcpy(ibuf, env->cube[3]->ibuf, 0, dx, 0, 0, dx, dx);
+	IMB_rectcpy(ibuf, env->cube[4]->ibuf, dx, dx, 0, 0, dx, dx);
+	IMB_rectcpy(ibuf, env->cube[5]->ibuf, 2*dx, dx, 0, 0, dx, dx);
 	
 	BIF_write_ibuf(ibuf, str);
 	IMB_freeImBuf(ibuf);