blender
/
blender
137
415
Fork 598
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Fix #105388: Default Font Accidentally Kerning #105415

Merged
Harley Acheson merged 1 commits from Harley/blender:DefaultKerning into blender-v3.5-release 2023-03-03 23:17:32 +01:00
Conversation 2 Commits 1 Files Changed 2 +8 -7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenfont/intern/blf.c
View File

@ -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) {

8
source/blender/blenfont/intern/blf_font.c
View File

@ -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));
}