1 files changed, 5 insertions, 13 deletions
diff --git a/source/blender/editors/interface/interface_style.cc b/source/blender/editors/interface/interface_style.cc
index 291ede05730..904765f6dc4 100644
--- a/source/blender/editors/interface/interface_style.cc
+++ b/source/blender/editors/interface/interface_style.cc
@@ -382,19 +382,8 @@ void uiStyleInit(void)
   }
   CLAMP(U.dpi, 48, 144);
 
-  LISTBASE_FOREACH (uiFont *, font, &U.uifonts) {
-    BLF_unload_id(font->blf_id);
-  }
-
-  if (blf_mono_font != -1) {
-    BLF_unload_id(blf_mono_font);
-    blf_mono_font = -1;
-  }
-
-  if (blf_mono_font_render != -1) {
-    BLF_unload_id(blf_mono_font_render);
-    blf_mono_font_render = -1;
-  }
+  /* Needed so that custom fonts are always first. */
+  BLF_unload_all();
 
   uiFont *font_first = static_cast<uiFont *>(U.uifonts.first);
 
@@ -498,6 +487,9 @@ void uiStyleInit(void)
     const bool unique = true;
     blf_mono_font_render = BLF_load_mono_default(unique);
   }
+
+  /* Load the fallback fonts last. */
+  BLF_load_font_stack();
 }
 
 void UI_fontstyle_set(const uiFontStyle *fs)