[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60698] trunk/blender/source/blender: More fixes for PSD support in SCons scirpts...

[Shinsuke Irie]

Revision: 60698
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60698
Author:   irie
Date:     2013-10-12 06:11:26 +0000 (Sat, 12 Oct 2013)
Log Message:
-----------
More fixes for PSD support in SCons scirpts...

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_file/SConscript
    trunk/blender/source/blender/editors/space_image/SConscript
    trunk/blender/source/blender/makesrna/intern/SConscript

Modified: trunk/blender/source/blender/editors/space_file/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_file/SConscript	2013-10-12 03:42:06 UTC (rev 60697)
+++ trunk/blender/source/blender/editors/space_file/SConscript	2013-10-12 06:11:26 UTC (rev 60698)
@@ -55,6 +55,9 @@
 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')
 

Modified: trunk/blender/source/blender/editors/space_image/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_image/SConscript	2013-10-12 03:42:06 UTC (rev 60697)
+++ trunk/blender/source/blender/editors/space_image/SConscript	2013-10-12 06:11:26 UTC (rev 60698)
@@ -57,6 +57,8 @@
     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']

Modified: trunk/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/intern/SConscript	2013-10-12 03:42:06 UTC (rev 60697)
+++ trunk/blender/source/blender/makesrna/intern/SConscript	2013-10-12 06:11:26 UTC (rev 60698)
@@ -82,6 +82,9 @@
     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')