This commit reverses the OpenEXR specific stuff in the OpenEXR commit I
[blender-staging.git] / source / blender / imbuf / intern / readimage.c
index 9d40ef602f8523b0822e6fed63923272c969345a..15a9c259e653f073b770867e28b4de4bada90d46 100644 (file)
 #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"
@@ -142,11 +138,6 @@ 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) {