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:
authorIrie Shinsuke <irieshinsuke@yahoo.co.jp>2013-10-12 03:14:01 +0400
committerIrie Shinsuke <irieshinsuke@yahoo.co.jp>2013-10-12 03:14:01 +0400
commit90cd0a37a9c84964dd0daac3f553800e529fae29 (patch)
tree31d50d407119c47c06ce6339c7093537dccbce1a /source/blender/makesrna
parentc742bc266aa133bd5f230930ccd11c6cf954d939 (diff)
Fix build scripts related to PSD support. Both CMake and SCons builds were broken.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/SConscript2
-rw-r--r--source/blender/makesrna/intern/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index 9026b166311..5053c8082e9 100644
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -67,7 +67,7 @@ if env['WITH_BF_BULLET']:
incs += ' #/intern/rigidbody'
if env['WITH_BF_OIIO']:
- defs.append('WITH_OIIO')
+ defs.append('WITH_OPENIMAGEIO')
if env['WITH_BF_OPENEXR']:
defs.append('WITH_OPENEXR')
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 674b41dfa45..bac335572f5 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -166,7 +166,7 @@ if(WITH_IMAGE_OPENEXR)
add_definitions(-DWITH_OPENEXR)
endif()
-if(WITH_OPENIMAGEIO)
+if(WITH_IMAGE_OPENIMAGEIO)
add_definitions(-DWITH_OPENIMAGEIO)
endif()