diff options
author | Kent Mein <mein@cs.umn.edu> | 2005-03-11 23:16:14 +0300 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2005-03-11 23:16:14 +0300 |
commit | a1919e6db4e20f1ab16646d3cbb273f569af23e1 (patch) | |
tree | 60642648c9d0b35a1c8f81bf96bdb7c60acba2d7 /source/blender/imbuf/intern/readimage.c | |
parent | c6d51245604b8c1bb329f5362ad528cc6f31c085 (diff) |
Gernot Ziegler's patch to add OpenEXR support to blender.
To enable it you will need to download OpenEXR and install it.
For the Makefiles you will need to set WITH_OPENEXR=true
and set NAN_OPENEXR to point to where OpenEXR is installed.
For scons you'll need to remove config.opts to get the new options
so you can enable OpenEXR, I was not able to get blender to link
with scons so the scons stuff may need to be tweaked a little but
I think it should work.
For other platform managers The OpenEXR stuff is similar to QUICKTIME
you need to define WITH_OPENEXR and setup the library stuff and
as you'll notice in this commit there are two extra files.
Kent
Diffstat (limited to 'source/blender/imbuf/intern/readimage.c')
-rw-r--r-- | source/blender/imbuf/intern/readimage.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c index 0f817e22dd1..9d40ef602f8 100644 --- a/source/blender/imbuf/intern/readimage.c +++ b/source/blender/imbuf/intern/readimage.c @@ -47,6 +47,11 @@ #include "IMB_jpeg.h" #include "IMB_bmp.h" #include "BKE_global.h" + +#ifdef WITH_OPENEXR +#include "IMB_openexr.h" +#endif + #ifdef WITH_QUICKTIME #if defined(_WIN32) || defined (__APPLE__) #include "quicktime_import.h" @@ -137,6 +142,11 @@ ImBuf *IMB_ibImageFromMemory(int *mem, int size, int flags) { ibuf = imb_loadtarga((uchar *)mem, flags); if (ibuf) return(ibuf); +#ifdef WITH_OPENEXR + ibuf = imb_load_openexr((uchar *)mem, size, flags); + if (ibuf) return(ibuf); +#endif + #ifdef WITH_QUICKTIME #if defined(_WIN32) || defined (__APPLE__) if(G.have_quicktime) { |