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).
This commit is contained in:
@@ -28,6 +28,8 @@ if env['WITH_BF_QUICKTIME']:
|
||||
|
||||
if env['WITH_BF_SDL']:
|
||||
incs += ' ' + env['BF_SDL_INC']
|
||||
else:
|
||||
defs += ' DISABLE_SDL'
|
||||
|
||||
if env['WITH_BF_INTERNATIONAL']:
|
||||
defs += ' WITH_FREETYPE2'
|
||||
|
||||
Reference in New Issue
Block a user