diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index a8cbb89c7ad..b6f7bb5a066 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -163,13 +163,6 @@ 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 - * (#101506). 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_font.c b/source/blender/blenfont/intern/blf_font.c index 2c877ecb41d..226ad9e6cc3 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -1430,6 +1430,14 @@ bool blf_ensure_face(FontBLF *font) font->face_flags = font->face->face_flags; + /* 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 + * (#101506). Enable again later with change of font, placement, or rendering - Harley. */ + if (font && font->filepath && BLI_str_endswith(font->filepath, BLF_DEFAULT_PROPORTIONAL_FONT)) { + font->face_flags &= ~FT_FACE_FLAG_KERNING; + } + if (FT_HAS_MULTIPLE_MASTERS(font)) { FT_Get_MM_Var(font->face, &(font->variations)); }