Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2005-03-14 17:56:40 +0300
committerKent Mein <mein@cs.umn.edu>2005-03-14 17:56:40 +0300
commitecf6de151c5c2a4794a6c0f700dcc47568d3b78b (patch)
tree8b89e296b52987ef56751f9e390acaf8a596b531 /source/blender/imbuf/intern/readimage.c
parentcce74ab4d02bb793c199b7dfdb193e30cc590092 (diff)
This commit reverses the OpenEXR specific stuff in the OpenEXR commit I
did last friday. A patch will be available in the patches tracker that will have the current stuff there until everything is working. Kent
Diffstat (limited to 'source/blender/imbuf/intern/readimage.c')
-rw-r--r--source/blender/imbuf/intern/readimage.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/source/blender/imbuf/intern/readimage.c b/source/blender/imbuf/intern/readimage.c
index 9d40ef602f8..15a9c259e65 100644
--- a/source/blender/imbuf/intern/readimage.c
+++ b/source/blender/imbuf/intern/readimage.c
@@ -48,10 +48,6 @@
#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) {