From 6caacff196e65cbdfadebcb695f54a0bb3dea891 Mon Sep 17 00:00:00 2001 From: Irie Shinsuke Date: Sat, 12 Oct 2013 06:11:26 +0000 Subject: [PATCH] More fixes for PSD support in SCons scirpts... --- source/blender/editors/space_file/SConscript | 3 +++ source/blender/editors/space_image/SConscript | 2 ++ source/blender/makesrna/intern/SConscript | 3 +++ 3 files changed, 8 insertions(+) diff --git a/source/blender/editors/space_file/SConscript b/source/blender/editors/space_file/SConscript index e1eadb66a11..d42394454eb 100644 --- a/source/blender/editors/space_file/SConscript +++ b/source/blender/editors/space_file/SConscript @@ -55,6 +55,9 @@ if env['WITH_BF_OPENEXR']: if env['WITH_BF_TIFF']: defs.append('WITH_TIFF') +if env['WITH_BF_OIIO']: + defs.append('WITH_OPENIMAGEIO') + if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') diff --git a/source/blender/editors/space_image/SConscript b/source/blender/editors/space_image/SConscript index 268172b300d..89def32e70f 100644 --- a/source/blender/editors/space_image/SConscript +++ b/source/blender/editors/space_image/SConscript @@ -57,6 +57,8 @@ if env['WITH_BF_TIFF']: defs.append('WITH_TIFF') if env['WITH_BF_CINEON']: defs.append('WITH_CINEON') +if env['WITH_BF_OIIO']: + defs.append('WITH_OPENIMAGEIO') if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): incs += ' ' + env['BF_PTHREADS_INC'] diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index e1fad55f485..fe6950e62dd 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -82,6 +82,9 @@ if env['WITH_BF_BULLET']: defs.append('WITH_BULLET') incs += ' #/intern/rigidbody' +if env['WITH_BF_OIIO']: + defs.append('WITH_OPENIMAGEIO') + if env['WITH_BF_OPENEXR']: defs.append('WITH_OPENEXR')