|
@@ -4417,7 +4417,7 @@ static ImFontGlyph* ImFontBaked_BuildLoadGlyph(ImFontBaked* baked, ImWchar codep
|
|
if (atlas->Locked || (font->Flags & ImFontFlags_NoLoadGlyphs))
|
|
if (atlas->Locked || (font->Flags & ImFontFlags_NoLoadGlyphs))
|
|
{
|
|
{
|
|
// Lazily load fallback glyph
|
|
// Lazily load fallback glyph
|
|
- if (baked->FallbackGlyphIndex == -1 && baked->LockLoadingFallback == 0)
|
|
|
|
|
|
+ if (baked->FallbackGlyphIndex == -1 && baked->LoadNoFallback == 0)
|
|
ImFontAtlasBuildSetupFontBakedFallback(baked);
|
|
ImFontAtlasBuildSetupFontBakedFallback(baked);
|
|
return NULL;
|
|
return NULL;
|
|
}
|
|
}
|
|
@@ -4469,7 +4469,7 @@ static ImFontGlyph* ImFontBaked_BuildLoadGlyph(ImFontBaked* baked, ImWchar codep
|
|
}
|
|
}
|
|
|
|
|
|
// Lazily load fallback glyph
|
|
// Lazily load fallback glyph
|
|
- if (baked->LockLoadingFallback)
|
|
|
|
|
|
+ if (baked->LoadNoFallback)
|
|
return NULL;
|
|
return NULL;
|
|
if (baked->FallbackGlyphIndex == -1)
|
|
if (baked->FallbackGlyphIndex == -1)
|
|
ImFontAtlasBuildSetupFontBakedFallback(baked);
|
|
ImFontAtlasBuildSetupFontBakedFallback(baked);
|
|
@@ -5222,9 +5222,9 @@ ImFontGlyph* ImFontBaked::FindGlyphNoFallback(ImWchar c)
|
|
if (i != IM_FONTGLYPH_INDEX_UNUSED)
|
|
if (i != IM_FONTGLYPH_INDEX_UNUSED)
|
|
return &Glyphs.Data[i];
|
|
return &Glyphs.Data[i];
|
|
}
|
|
}
|
|
- LockLoadingFallback = true; // This is actually a rare call, not done in hot-loop, so we prioritize not adding extra cruft to ImFontBaked_BuildLoadGlyph() call sites.
|
|
|
|
|
|
+ LoadNoFallback = true; // This is actually a rare call, not done in hot-loop, so we prioritize not adding extra cruft to ImFontBaked_BuildLoadGlyph() call sites.
|
|
ImFontGlyph* glyph = ImFontBaked_BuildLoadGlyph(this, c, NULL);
|
|
ImFontGlyph* glyph = ImFontBaked_BuildLoadGlyph(this, c, NULL);
|
|
- LockLoadingFallback = false;
|
|
|
|
|
|
+ LoadNoFallback = false;
|
|
return glyph;
|
|
return glyph;
|
|
}
|
|
}
|
|
|
|
|