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.
23 lines
727 B
Python
23 lines
727 B
Python
#!/usr/bin/python
|
|
Import ('env')
|
|
|
|
SConscript(['BlenderRoutines/SConscript',
|
|
'Converter/SConscript',
|
|
'Expressions/SConscript', #310
|
|
'GameLogic/SConscript',
|
|
'Ketsji/SConscript',
|
|
'Ketsji/KXNetwork/SConscript',
|
|
'Network/SConscript',
|
|
'Network/LoopBackNetwork/SConscript',
|
|
'Physics/common/SConscript',
|
|
'Physics/Dummy/SConscript',
|
|
'Rasterizer/SConscript',
|
|
'Rasterizer/RAS_OpenGLRasterizer/SConscript',
|
|
'SceneGraph/SConscript',
|
|
'Physics/Bullet/SConscript',
|
|
'VideoTexture/SConscript'
|
|
])
|
|
|
|
if env['WITH_BF_PLAYER']:
|
|
SConscript(['GamePlayer/SConscript'])
|