diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
| commit | 9282d305bdc56522543129436db1e8a5d19cf39f (patch) | |
| tree | b6d0cdcc7dd3f4113cf9e4f9813c40f44d29746e /source/blender/blenfont/intern/blf_translation.c | |
| parent | de724a258eda45d1fed2b2176006c3b2df8abea2 (diff) | |
| parent | 646a96bf8edc211a06f3df652101c265ee166e8d (diff) | |
Merge branch 'master' into texture_nodes_refactortexture_nodes_refactor
Conflicts:
source/blender/nodes/texture/nodes/node_texture_math.c
Diffstat (limited to 'source/blender/blenfont/intern/blf_translation.c')
| -rw-r--r-- | source/blender/blenfont/intern/blf_translation.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenfont/intern/blf_translation.c b/source/blender/blenfont/intern/blf_translation.c index 150ff1b2107..e7d2c14b16f 100644 --- a/source/blender/blenfont/intern/blf_translation.c +++ b/source/blender/blenfont/intern/blf_translation.c @@ -42,6 +42,8 @@ #include "BLI_path_util.h" #include "BLI_string.h" +#include "BKE_appdir.h" + #include "DNA_userdef_types.h" /* For user settings. */ #include "BPY_extern.h" @@ -62,7 +64,7 @@ unsigned char *BLF_get_unifont(int *r_unifont_size) { #ifdef WITH_INTERNATIONAL if (unifont_ttf == NULL) { - const char * const fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts"); + const char * const fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts"); if (fontpath) { char unifont_path[1024]; @@ -97,7 +99,7 @@ unsigned char *BLF_get_unifont_mono(int *r_unifont_size) { #ifdef WITH_INTERNATIONAL if (unifont_mono_ttf == NULL) { - const char *fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts"); + const char *fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts"); if (fontpath) { char unifont_path[1024]; |