diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-03-18 00:44:58 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-03-18 00:44:58 +0300 |
commit | d52400bfbd2a7e4d09b5a71bc461a554d232af15 (patch) | |
tree | 08815f065fc90aac0ae62ae5f3a89d20e19399e6 /extern/SConscript | |
parent | 1ac0d54fea831c485e8e27e8bfa887e15beb58de (diff) | |
parent | 28f6d223d079b1e5cb67e3fc22fb7f818deb8dcb (diff) |
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317
Notes:
* Sequence transform strip uses G.scene global, this is commented
out now, should be fixed.
* Etch-a-ton code was most difficult to merge. The files already in
2.5 got merged, but no new files were added. Calls to these files
are commented out with "XXX etch-a-ton". editarmature.c and
transform_snap.c were complex to merge. Martin, please check?
* Game engine compiles and links again here for scons/make/cmake
(player still fails to link).
Diffstat (limited to 'extern/SConscript')
-rw-r--r-- | extern/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extern/SConscript b/extern/SConscript index 972d2a8e703..716aee8991f 100644 --- a/extern/SConscript +++ b/extern/SConscript @@ -5,8 +5,8 @@ Import('env') SConscript(['glew/SConscript']) if env['WITH_BF_GAMEENGINE']: - SConscript(['qhull/SConscript', - 'solid/SConscript']) + if env['WITH_BF_SOLID']: + SConscript(['qhull/SConscript', 'solid/SConscript']) if env['WITH_BF_BULLET']: SConscript(['bullet2/src/SConscript']) |