griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #135421: BLF Show Most Control Characters as Space

Browse Source 
Prior versions of Blender showed control characters as spaces, but
since we recently made fallback optional they are no longer visible.
This is because with fallback we are guaranteed to return a glyph, but
without fallback the current font will not have entries for these. This
PR just shows them as spaces, just like before. But does not do so for
carriage return and line feed.

Pull Request: https://projects.blender.org/blender/blender/pulls/135484
This commit is contained in:
Harley Acheson
2025-03-05 01:09:53 +01:00
committed by Harley Acheson
parent f3161149db
commit 4da5377e17
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenfont/intern/blf_glyph.cc
View File

@@ -1352,8 +1352,13 @@ static FT_GlyphSlot blf_glyph_render(FontBLF *settings_font,
GlyphBLF *blf_glyph_ensure(FontBLF *font, GlyphCacheBLF *gc, const uint charcode, uint8_t subpixel)
{
if (charcode < 32) {
/* Do not render C0 controls (U+0000 - U+001F) characters. #134972 */
return nullptr;
if (ELEM(charcode, 0x10, 0x13)) {
/* Do not render line feed or carriage return. #134972. */
return nullptr;
}
/* Other C0 controls (U+0000 - U+001F) can show as space. #135421. */
/* TODO: Return all but TAB as ".notdef" character when we have our own. */
return blf_glyph_cache_find_glyph(gc, ' ', 0);
}
GlyphBLF *g = blf_glyph_cache_find_glyph(gc, charcode, subpixel);