diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2010-11-12 10:16:33 +0300 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2010-11-12 10:16:33 +0300 |
| commit | d43d5d769059f0d6f8d90a0df71ac65728fa8de4 (patch) | |
| tree | 5328be7de5674927bbf3a5618b7e72bae677b788 /source/blender | |
| parent | 4f4bd275129f12ef3a8f021d95a5423985752f7b (diff) | |
Getting BLF to work with the Blenderplayer.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/datafiles/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/datafiles/SConscript b/source/blender/editors/datafiles/SConscript index 99acd52806e..dd0db90af44 100644 --- a/source/blender/editors/datafiles/SConscript +++ b/source/blender/editors/datafiles/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' #/intern/guardedalloc' -env.BlenderLib ( 'bf_editor_datafiles', sources, Split(incs), [], libtype=['core'], priority=[235] ) +env.BlenderLib ( 'bf_editor_datafiles', sources, Split(incs), [], libtype=['core', 'player'], priority=[235, 30] ) diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index d98459a113c..855317b9f76 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -129,7 +129,7 @@ void WM_init(bContext *C, int argc, char **argv) ED_file_init(); /* for fsmenu */ ED_init_node_butfuncs(); - BLF_init(11, U.dpi); + BLF_init(11, U.dpi); /* Please update source/gamengine/GamePlayer/GPG_ghost.cpp if you change this */ BLF_lang_init(); /* get the default database, plus a wm */ |