2004-05-16 13:07:20 +00:00
|
|
|
#!/usr/bin/python
|
2006-02-04 14:15:10 +00:00
|
|
|
Import ('env')
|
2006-08-22 13:04:07 +00:00
|
|
|
import sys
|
2004-01-04 21:11:59 +00:00
|
|
|
|
2004-02-15 19:25:32 +00:00
|
|
|
SConscript(['avi/SConscript',
|
|
|
|
|
'blenkernel/SConscript',
|
|
|
|
|
'blenlib/SConscript',
|
|
|
|
|
'blenloader/SConscript',
|
|
|
|
|
'blenpluginapi/SConscript',
|
Merge of first part of changes from the apricot branch, especially
the features that are needed to run the game. Compile tested with
scons, make, but not cmake, that seems to have an issue not related
to these changes. The changes include:
* GLSL support in the viewport and game engine, enable in the game
menu in textured draw mode.
* Synced and merged part of the duplicated blender and gameengine/
gameplayer drawing code.
* Further refactoring of game engine drawing code, especially mesh
storage changed a lot.
* Optimizations in game engine armatures to avoid recomputations.
* A python function to get the framerate estimate in game.
* An option take object color into account in materials.
* An option to restrict shadow casters to a lamp's layers.
* Increase from 10 to 18 texture slots for materials, lamps, word.
An extra texture slot shows up once the last slot is used.
* Memory limit for undo, not enabled by default yet because it
needs the .B.blend to be changed.
* Multiple undo for image painting.
* An offset for dupligroups, so not all objects in a group have to
be at the origin.
2008-09-04 20:51:28 +00:00
|
|
|
'gpu/SConscript',
|
2009-09-18 22:25:49 +00:00
|
|
|
'editors/SConscript',
|
2009-09-28 03:56:31 +00:00
|
|
|
'freestyle/SConscript',
|
2004-01-04 21:11:59 +00:00
|
|
|
'imbuf/SConscript',
|
|
|
|
|
'makesdna/SConscript',
|
2004-02-15 19:25:32 +00:00
|
|
|
'render/SConscript',
|
2009-09-18 22:25:49 +00:00
|
|
|
'nodes/SConscript',
|
2010-04-11 22:12:30 +00:00
|
|
|
'modifiers/SConscript',
|
2009-09-24 21:22:24 +00:00
|
|
|
'ikplugin/SConscript',
|
2009-09-18 22:25:49 +00:00
|
|
|
'windowmanager/SConscript',
|
2009-09-25 02:40:10 +00:00
|
|
|
'blenfont/SConscript'])
|
2006-10-18 05:45:47 +00:00
|
|
|
|
2011-11-08 20:40:02 +00:00
|
|
|
makesrna = SConscript('makesrna/SConscript')
|
2008-10-28 18:47:13 +00:00
|
|
|
|
|
|
|
|
if env['WITH_BF_PYTHON']:
|
|
|
|
|
SConscript(['python/SConscript'])
|
|
|
|
|
|
2008-10-22 11:28:10 +00:00
|
|
|
if env['WITH_BF_DDS']:
|
2007-06-25 19:50:25 +00:00
|
|
|
SConscript (['imbuf/intern/dds/SConscript'])
|
|
|
|
|
|
2010-08-03 11:25:34 +00:00
|
|
|
if env['WITH_BF_CINEON']:
|
|
|
|
|
SConscript (['imbuf/intern/cineon/SConscript'])
|
|
|
|
|
|
2008-10-22 11:28:10 +00:00
|
|
|
if env['WITH_BF_OPENEXR']:
|
2006-02-04 14:15:10 +00:00
|
|
|
SConscript (['imbuf/intern/openexr/SConscript'])
|
|
|
|
|
|
2008-10-22 11:28:10 +00:00
|
|
|
if env['WITH_BF_QUICKTIME']:
|
2004-01-04 21:11:59 +00:00
|
|
|
SConscript (['quicktime/SConscript'])
|
Merge of the COLLADA GSoC branch into trunk.
COLLADA code is disabled by default (it has dependencies requiring manual install).
SCons and CMake builds are supported on Windows and Linux, no Mac building yet. More on building COLLADA code: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch.
The detailed command log of the merge (can be useful for educational purposes):
branch=https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-chingachgook
# collada code
svn copy $branch/source/blender/collada source/blender/collada
# operator
svn merge -c 20401,20955,21077,24077,24079 $branch/source/blender/windowmanager/intern/wm_operators.c source/blender/windowmanager/intern/wm_operators.c
# menu
svn merge -c 24079 $branch/release/scripts/ui/space_info.py release/scripts/ui/space_info.py
# scons
svn merge -c 20398 $branch/source/blender/SConscript source/blender/SConscript
svn merge -c 20398,20691,20955,22726 $branch/tools/btools.py tools/btools.py
svn merge -c 20691,20955,22726 $branch/tools/Blender.py tools/Blender.py
svn merge -c 20398,20692,20955 $branch/config/linux2-config.py config/linux2-config.py
svn merge -c 22726 $branch/config/win64-vc-config.py config/win64-vc-config.py
svn merge -c 22726 $branch/config/win32-vc-config.py config/win32-vc-config.py
svn merge -c 24077 $branch/source/blender/windowmanager/SConscript source/blender/windowmanager/SConscript
# cmake
svn merge -c 23319,23905,24077,24158 $branch/CMakeLists.txt CMakeLists.txt
svn merge -c 23319 $branch/source/blender/CMakeLists.txt source/blender/CMakeLists.txt
svn merge -c 23319 $branch/source/creator/CMakeLists.txt source/creator/CMakeLists.txt
svn merge -c 23319 $branch/CMake/macros.cmake CMake/macros.cmake
svn merge -c 24077 $branch/source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/CMakeLists.txt
2009-10-30 15:35:50 +00:00
|
|
|
|
|
|
|
|
if env['WITH_BF_COLLADA']:
|
|
|
|
|
SConscript (['collada/SConscript'])
|