diff options
Diffstat (limited to 'source/blender/editors/space_file')
| -rw-r--r-- | source/blender/editors/space_file/filelist.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 6ac67a126cd..93c27e1fe90 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -37,6 +37,8 @@ #endif #include "MEM_guardedalloc.h" +#include "BLF_api.h" + #include "BLI_blenlib.h" #include "BLI_fileops.h" #include "BLI_fileops_types.h" @@ -1812,13 +1814,23 @@ BlendHandle *filelist_lib(struct FileList *filelist) return filelist->libfiledata; } -static const char *fileentry_uiname(const char *root, - const char *relpath, - const eFileSel_File_Types typeflag, - char *buff) +static char *fileentry_uiname(const char *root, + const char *relpath, + const eFileSel_File_Types typeflag, + char *buff) { char *name = NULL; + if (typeflag & FILE_TYPE_FTFONT && !(typeflag & FILE_TYPE_BLENDERLIB)) { + char abspath[FILE_MAX_LIBEXTRA]; + BLI_join_dirfile(abspath, sizeof(abspath), root, relpath); + name = BLF_display_name_from_file(abspath); + if (name) { + /* Allocated string, so no need to BLI_strdup.*/ + return name; + } + } + if (typeflag & FILE_TYPE_BLENDERLIB) { char abspath[FILE_MAX_LIBEXTRA]; char *group; @@ -1840,7 +1852,7 @@ static const char *fileentry_uiname(const char *root, } BLI_assert(name); - return name; + return BLI_strdup(name); } const char *filelist_dir(struct FileList *filelist) @@ -3203,7 +3215,7 @@ static void filelist_readjob_do(const bool do_lib, MEM_freeN(entry->relpath); entry->relpath = BLI_strdup(dir + 2); /* + 2 to remove '//' * added by BLI_path_rel to rel_subdir. */ - entry->name = BLI_strdup(fileentry_uiname(root, entry->relpath, entry->typeflag, dir)); + entry->name = fileentry_uiname(root, entry->relpath, entry->typeflag, dir); entry->free_name = true; /* Here we decide whether current filedirentry is to be listed too, or not. */ |