3 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index a673f4a1bc7..d4f5be617fd 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -162,6 +162,14 @@ int BLF_load_unique(const char *name)
   }
 
   FontBLF *font = blf_font_new(name, filepath);
+
+  /* XXX: Temporarily disable kerning in our main font. Kerning had been accidentally removed from
+   * our font in 3.1. In 3.4 we disable kerning here in the new version to keep spacing the same
+   * (T101506). Enable again later with change of font, placement, or rendering - Harley. */
+  if (font && BLI_str_endswith(filepath, BLF_DEFAULT_PROPORTIONAL_FONT)) {
+    font->face_flags &= ~FT_FACE_FLAG_KERNING;
+  }
+
   MEM_freeN(filepath);
 
   if (!font) {
diff --git a/source/blender/blenfont/intern/blf_dir.c b/source/blender/blenfont/intern/blf_dir.c
index 8534a8c583f..395d981cb0b 100644
--- a/source/blender/blenfont/intern/blf_dir.c
+++ b/source/blender/blenfont/intern/blf_dir.c
@@ -115,7 +115,7 @@ char *blf_dir_search(const char *file)
   char *s = NULL;
 
   for (dir = global_font_dir.first; dir; dir = dir->next) {
-    BLI_join_dirfile(full_path, sizeof(full_path), dir->path, file);
+    BLI_path_join(full_path, sizeof(full_path), dir->path, file);
     if (BLI_exists(full_path)) {
       s = BLI_strdup(full_path);
       break;
diff --git a/source/blender/blenfont/intern/blf_font_default.c b/source/blender/blenfont/intern/blf_font_default.c
index d35692f6eae..63b1cf34db5 100644
--- a/source/blender/blenfont/intern/blf_font_default.c
+++ b/source/blender/blenfont/intern/blf_font_default.c
@@ -32,7 +32,7 @@ static int blf_load_font_default(const char *filename, const bool unique)
   }
 
   char filepath[FILE_MAX];
-  BLI_join_dirfile(filepath, sizeof(filepath), dir, filename);
+  BLI_path_join(filepath, sizeof(filepath), dir, filename);
 
   return (unique) ? BLF_load_unique(filepath) : BLF_load(filepath);
 }