diff options
| author | Kent Mein <mein@cs.umn.edu> | 2005-03-14 17:56:40 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2005-03-14 17:56:40 +0300 |
| commit | ecf6de151c5c2a4794a6c0f700dcc47568d3b78b (patch) | |
| tree | 8b89e296b52987ef56751f9e390acaf8a596b531 /source/blender/blenkernel/intern | |
| parent | cce74ab4d02bb793c199b7dfdb193e30cc590092 (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/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/Makefile | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 5 |
2 files changed, 0 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index 0b8c0a03217..c91ba45048c 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -78,6 +78,3 @@ ifeq ($(WITH_FREETYPE2), true) CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2 endif -ifeq ($(WITH_OPENEXR), true) - CPPFLAGS += -DWITH_OPENEXR -endif diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index e4752220737..d8c455c9c48 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -193,11 +193,6 @@ void makepicstring(char *string, int frame) else if(G.scene->r.imtype==R_PNG) { extension= ".png"; } -#ifdef WITH_OPENEXR - else if(G.scene->r.imtype==R_OPENEXR) { - extension= ".exr"; - } -#endif else if(G.scene->r.imtype==R_TARGA) { extension= ".tga"; } |