diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-07-08 02:02:11 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-07-08 02:02:11 +0300 |
commit | db28e2deb9d154ed50600542e37828867d0148e5 (patch) | |
tree | 279612479f5a0052d4a189af6e36b3dbff1e231c /source/gameengine | |
parent | e960cecdf8d1cef32f8c42e633ad05a08a97972b (diff) | |
parent | 7dc3ad22873e08de11172757066bb2b3a27f7203 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 72ab06009b6..998058193bb 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -517,7 +517,7 @@ int main( #endif // Setup builtin font for BLF (mostly copied from creator.c, wm_init_exit.c and interface_style.c) - BLF_init(11, U.dpi); + BLF_init(); BLT_lang_init(); BLT_lang_set(""); |