https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338) with the "Ignore ancestry" and "Ignore line endings" options enabled (using TortoiseSVN on Windows). After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/ were reverted in order to keep the primary source tree of the Freestyle renderer.
35 lines
901 B
Python
35 lines
901 B
Python
#!/usr/bin/python
|
|
Import ('env')
|
|
import sys
|
|
|
|
SConscript(['avi/SConscript',
|
|
'blenkernel/SConscript',
|
|
'blenlib/SConscript',
|
|
'blenloader/SConscript',
|
|
'blenpluginapi/SConscript',
|
|
'gpu/SConscript',
|
|
'editors/SConscript',
|
|
'imbuf/SConscript',
|
|
'imbuf/intern/cineon/SConscript',
|
|
'makesdna/SConscript',
|
|
'makesrna/SConscript',
|
|
'readblenfile/SConscript',
|
|
'render/SConscript',
|
|
'nodes/SConscript',
|
|
'windowmanager/SConscript',
|
|
'blenfont/SConscript'])
|
|
|
|
|
|
|
|
if env['WITH_BF_PYTHON']:
|
|
SConscript(['python/SConscript'])
|
|
|
|
if env['WITH_BF_DDS']:
|
|
SConscript (['imbuf/intern/dds/SConscript'])
|
|
|
|
if env['WITH_BF_OPENEXR']:
|
|
SConscript (['imbuf/intern/openexr/SConscript'])
|
|
|
|
if env['WITH_BF_QUICKTIME']:
|
|
SConscript (['quicktime/SConscript'])
|