1 files changed, 12 insertions, 3 deletions
diff --git a/source/blender/blenfont/intern/blf_thumbs.c b/source/blender/blenfont/intern/blf_thumbs.c
index 9460e9413d1..676d5ab2362 100644
--- a/source/blender/blenfont/intern/blf_thumbs.c
+++ b/source/blender/blenfont/intern/blf_thumbs.c
@@ -46,12 +46,20 @@ void BLF_thumb_preview(const char *filepath,
   /* shrink 1/th each line */
   int font_shrink = 4;
 
-  FontBLF *font;
+  /* While viewing thumbnails in font directories this function can be called simultaneously from a
+   * greater number of threads than we want the FreeType cache to keep open at a time. Therefore
+   * pass own FT_Library to font creation so that it is not managed by the FreeType cache system.
+   */
 
-  /* Create a new blender font obj and fill it with default values */
-  font = blf_font_new("thumb_font", filepath);
+  FT_Library ft_library = NULL;
+  if (FT_Init_FreeType(&ft_library) != FT_Err_Ok) {
+    return;
+  }
+
+  FontBLF *font = blf_font_new_ex("thumb_font", filepath, NULL, 0, ft_library);
   if (!font) {
     printf("Info: Can't load font '%s', no preview possible\n", filepath);
+    FT_Done_FreeType(ft_library);
     return;
   }
 
@@ -102,4 +110,5 @@ void BLF_thumb_preview(const char *filepath,
 
   blf_draw_buffer__end();
   blf_font_free(font);
+  FT_Done_FreeType(ft_library);
 }