diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-06-02 05:40:53 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-06-02 05:40:53 +0400 |
| commit | 37f47ef3862a85d4d95fe5b18ab3d6b9c88ccdd3 (patch) | |
| tree | a648a61fbbc313c2833a5e4eb3c8d8d75da3c090 /source/blender/render/SConscript | |
| parent | 33267f58581ea8f9d89028958c6e64a8d048d4db (diff) | |
| parent | a117731aa23c25d699c405325c7bb7ac5680a5e7 (diff) | |
NLA SoC: Merge from 2.5 20441 to 20570 (HEAD)
There were a few conflicts/missing files. Hopefully everything updated ok...
Diffstat (limited to 'source/blender/render/SConscript')
| -rw-r--r-- | source/blender/render/SConscript | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index c3fdc632ce4..173f5db8482 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -10,11 +10,6 @@ incs += ' ../include ../blenloader' defs = [] -if env['WITH_BF_YAFRAY']: - incs += ' ../yafray' -else: - defs.append('DISABLE_YAFRAY') - if env['WITH_BF_QUICKTIME']: defs.append('WITH_QUICKTIME') incs += ' ../quicktime ' + env['BF_QUICKTIME_INC'] |