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:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-08-09 15:32:55 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-08-09 15:32:55 +0400
commitdd75ec490761640571a0d8e53a0d439091f2736f (patch)
tree25b3966862febbf3ee8c81ed45f7045c99f84016 /source/blender/SConscript
parent02b0967bd11dd6fd2454b37182d9f94ea451b603 (diff)
parentc026b8066ddc1c42144d2e5132384ea7c1211050 (diff)
Merged changes in the trunk up to revision 31190.
Diffstat (limited to 'source/blender/SConscript')
-rw-r--r--source/blender/SConscript4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/SConscript b/source/blender/SConscript
index 834e83ec0e1..1489f9a3738 100644
--- a/source/blender/SConscript
+++ b/source/blender/SConscript
@@ -11,7 +11,6 @@ SConscript(['avi/SConscript',
'editors/SConscript',
'freestyle/SConscript',
'imbuf/SConscript',
- 'imbuf/intern/cineon/SConscript',
'makesdna/SConscript',
'makesrna/SConscript',
'readblenfile/SConscript',
@@ -30,6 +29,9 @@ if env['WITH_BF_PYTHON']:
if env['WITH_BF_DDS']:
SConscript (['imbuf/intern/dds/SConscript'])
+if env['WITH_BF_CINEON']:
+ SConscript (['imbuf/intern/cineon/SConscript'])
+
if env['WITH_BF_OPENEXR']:
SConscript (['imbuf/intern/openexr/SConscript'])