diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
| commit | bb7339a7aec37bdb2ee8a21599e6c65b37ef1277 (patch) | |
| tree | 6fb8da94c6e43098c606f768e722484b04b8645c /source/blender/SConscript | |
| parent | 37f2c8a64c3277f100ab084ef1bb3846bc7b2c62 (diff) | |
| parent | 8a320974f1b3e6004db3b3ad64f97742f878cbee (diff) | |
merge with trunk at r31523
Diffstat (limited to 'source/blender/SConscript')
| -rw-r--r-- | source/blender/SConscript | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/SConscript b/source/blender/SConscript index c4990dc765b..24514f1660c 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -11,7 +11,6 @@ SConscript(['avi/SConscript', 'gpu/SConscript', 'editors/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']) |