Merged changes in the trunk up to revision 55546.

Conflicts resolved:
source/blenderplayer/bad_level_call_stubs/SConscript

Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899
to make it easier to merge trunk changes.

1 files changed, 12 insertions, 11 deletions

diff --git a/source/blenderplayer/bad_level_call_stubs/SConscript b/source/blenderplayer/bad_level_call_stubs/SConscript
index 41c84051fdf..2dbb0e00eb0 100644
--- a/source/blenderplayer/bad_level_call_stubs/SConscript
+++ b/source/blenderplayer/bad_level_call_stubs/SConscript
@@ -27,21 +27,22 @@
 
 Import ('env')
 
-sources = 'stubs.c'
+sources = ['stubs.c']
 
-incs = '#/intern/guardedalloc'
-incs += ' #/source/blender/makesdna'
-incs += ' #/source/blender/makesrna'
-incs += ' #/source/blender/blenloader'
+incs = [
+    '#/intern/guardedalloc',
+    '#/source/blender/makesdna',
+    '#/source/blender/makesrna',
+    '#/source/blender/blenloader',
+    '#/source/blender/blenlib',
+    ]
 
-defs = ''
-if env['WITH_BF_INTERNATIONAL']:
-    defs += 'WITH_FREETYPE2'
+defs = []
 
 if env['WITH_BF_GAMEENGINE']:
-    defs += ' WITH_GAMEENGINE'
+    defs.append('WITH_GAMEENGINE')
 
 if env['WITH_BF_FREESTYLE']:
-    defs += ' WITH_FREESTYLE'
+    defs.append(' WITH_FREESTYLE')
 
-env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(defs), libtype=['player'],priority=[220] )
+env.BlenderLib('blenkernel_blc', sources=sources, includes=incs, defines=defs, libtype=['player'], priority=[220])