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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2009-08-17 02:53:15 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2009-08-17 02:53:15 +0400
commitd35a42d3e6de9666380db5ddc2b6ede60438beac (patch)
tree1ef90fe35ff86d2b576d41c7208ab2a8145d5112 /source/blender/editors/space_file
parent594121016d498757f6d9195d32b001e6bc7501ad (diff)
2.5: Render Api
* Add RenderResult.load_from_file to load whole multilayer exr's at once. * Removed x/y offset from RenderLayer.load_from_file, better to encourage using offset in begin_result() to minimize memory usage. * Added WITH_OPENEXR in some screen/file/image module for scons/make, exr was not working in some places there.
Diffstat (limited to 'source/blender/editors/space_file')
-rw-r--r--source/blender/editors/space_file/Makefile4
-rw-r--r--source/blender/editors/space_file/SConscript2
2 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/space_file/Makefile b/source/blender/editors/space_file/Makefile
index 2f4180448e5..43b2f09ed2d 100644
--- a/source/blender/editors/space_file/Makefile
+++ b/source/blender/editors/space_file/Makefile
@@ -59,3 +59,7 @@ ifeq ($(WITH_OPENJPEG),true)
CPPFLAGS += -DWITH_OPENJPEG
endif
+ifeq ($(WITH_OPENEXR), true)
+ CPPFLAGS += -DWITH_OPENEXR
+endif
+
diff --git a/source/blender/editors/space_file/SConscript b/source/blender/editors/space_file/SConscript
index 36e042bdaa6..e6fba38fb8f 100644
--- a/source/blender/editors/space_file/SConscript
+++ b/source/blender/editors/space_file/SConscript
@@ -12,5 +12,7 @@ defs = []
if env['WITH_BF_OPENJPEG']:
defs.append('WITH_OPENJPEG')
+if env['WITH_BF_OPENEXR']:
+ defs.append('WITH_OPENEXR')
env.BlenderLib ( 'bf_editors_space_file', sources, Split(incs), defs, libtype=['core'], priority=[115] )