Tamito Kajiyama
0ca96e1eb1
Conflicts resolved: source/blender/makesdna/intern/makesdna.c source/blender/makesrna/RNA_enum_types.h source/blender/render/intern/source/shadeinput.c source/blenderplayer/bad_level_call_stubs/stubs.c Additional changes: * source/blender/makesrna/intern/rna_linestyle.c: Fixed white space issues that generated a number of compiler errors. The problem was that two string literals for enumerating MA_RAMP_SOFT and MA_RAMP_LINEAR contained a space. The string literals are supposed to represent a valid C identifier because of their use for automatic code generation. * Stroke transparency has been temporarily disabled due to a functionality conflict with some merged changes. A fix of this issue is planned.
41 lines
1.1 KiB
Python
41 lines
1.1 KiB
Python
#!/usr/bin/python
|
|
Import ('env')
|
|
import sys
|
|
|
|
SConscript(['avi/SConscript',
|
|
'blenkernel/SConscript',
|
|
'blenlib/SConscript',
|
|
'blenloader/SConscript',
|
|
'blenpluginapi/SConscript',
|
|
'gpu/SConscript',
|
|
'editors/SConscript',
|
|
'freestyle/SConscript',
|
|
'imbuf/SConscript',
|
|
'makesdna/SConscript',
|
|
'render/SConscript',
|
|
'nodes/SConscript',
|
|
'modifiers/SConscript',
|
|
'ikplugin/SConscript',
|
|
'windowmanager/SConscript',
|
|
'blenfont/SConscript'])
|
|
|
|
makesrna = SConscript('makesrna/SConscript')
|
|
|
|
if env['WITH_BF_PYTHON']:
|
|
SConscript(['python/SConscript'])
|
|
|
|
if env['WITH_BF_DDS']:
|
|
SConscript (['imbuf/intern/dds/SConscript'])
|
|
|
|
if env['WITH_BF_CINEON']:
|
|
SConscript (['imbuf/intern/cineon/SConscript'])
|
|
|
|
if env['WITH_BF_OPENEXR']:
|
|
SConscript (['imbuf/intern/openexr/SConscript'])
|
|
|
|
if env['WITH_BF_QUICKTIME']:
|
|
SConscript (['quicktime/SConscript'])
|
|
|
|
if env['WITH_BF_COLLADA']:
|
|
SConscript (['collada/SConscript'])
|