diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-02-17 16:07:18 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-03-25 18:39:58 +0300 |
| commit | 68e341e9d59ae917eba992591f4f60660f6c58ff (patch) | |
| tree | 91db37d064f5f4ef50fa1dfd1168d4fa69094fc5 /source/blender/windowmanager/intern | |
| parent | 9070999c216b87f848dfd9a129b95e3d45a33fb3 (diff) | |
UI: remove non-unicode font and simplify default font loading code
There is no need to have another font embedded in the Blender executable, we
can assume the bundled font exists. In the future we may provide a fallback
if the font specified by the user in the preferences is missing a character,
but that can use our bundled international font.
Differential Revision: https://developer.blender.org/D6854
Diffstat (limited to 'source/blender/windowmanager/intern')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_playanim.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index b640fdb59c9..64cde724401 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -609,8 +609,6 @@ void WM_exit_ex(bContext *C, const bool do_python) } #ifdef WITH_INTERNATIONAL - BLF_free_unifont(); - BLF_free_unifont_mono(); BLT_lang_free(); #endif diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index c6eb1393ffe..8a872010ecc 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -1292,8 +1292,7 @@ static char *wm_main_playanim_intern(int argc, const char **argv) /* initialize the font */ BLF_init(); - ps.fontid = BLF_load_mem( - "monospace", (unsigned char *)datatoc_bmonofont_ttf, datatoc_bmonofont_ttf_size); + ps.fontid = BLF_load_mono_default(false); BLF_size(ps.fontid, 11, 72); ps.ibufx = ibuf->x; |