diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-03-11 19:02:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-11 19:02:27 +0200 |
| commit | 8297b923f0bec459ca2bfa916cf777ac5aa3af9e (patch) | |
| tree | 29df581352a6b0bfd1964b23c41b80db038f58a5 /indra/llrender | |
| parent | f02a400134d83a12f43151c3dba32732bf88fd8c (diff) | |
| parent | 8bb35ac0299eae3c6cd71bedd0acb85d5819d462 (diff) | |
Merge branch 'release/2025.03' into marchcat/2025.03-maint-b
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llfontfreetype.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index 62b551f1e0..649dd369cb 100644 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -725,11 +725,11 @@ void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index, ll || FT_Err_Invalid_Composite == error || (FT_Err_Ok != error && LLStringOps::isEmoji(wch))) { - glyph_index = FT_Get_Char_Index(mFTFace, '?'); - // if '?' is not present, potentially can use last index, that's supposed to be null glyph - if (glyph_index > 0) + // value~0 always corresponds to the 'missing glyph' + error = FT_Load_Glyph(mFTFace, 0, FT_LOAD_FORCE_AUTOHINT); + if (FT_Err_Ok != error) { - error = FT_Load_Glyph(mFTFace, glyph_index, load_flags ^ FT_LOAD_COLOR); + LL_ERRS() << "Loading fallback for char '" << (U32)wch << "', glyph " << glyph_index << " failed with error : " << (S32)error << LL_ENDL; } } llassert_always_msg(FT_Err_Ok == error, message.c_str()); |