Fonts: remove unnecessary ImDrawListSharedData::FontAtlas which is actually getting in the way of using multiple atlases.

This commit is contained in:
ocornut
2025-05-09 22:46:39 +02:00
parent 46fa9e8efb
commit 65e6039979
2 changed files with 2 additions and 6 deletions

View File

@@ -3865,16 +3865,14 @@ void ImFontAtlasBuildDiscardBakes(ImFontAtlas* atlas, int unused_frames)
// Those functions are designed to facilitate changing the underlying structures for ImFontAtlas to store an array of ImDrawListSharedData*
void ImFontAtlasAddDrawListSharedData(ImFontAtlas* atlas, ImDrawListSharedData* data)
{
IM_ASSERT(!atlas->DrawListSharedDatas.contains(data) && data->FontAtlas == NULL);
IM_ASSERT(!atlas->DrawListSharedDatas.contains(data));
atlas->DrawListSharedDatas.push_back(data);
data->FontAtlas = atlas;
}
void ImFontAtlasRemoveDrawListSharedData(ImFontAtlas* atlas, ImDrawListSharedData* data)
{
IM_ASSERT(atlas->DrawListSharedDatas.contains(data) && data->FontAtlas == atlas);
IM_ASSERT(atlas->DrawListSharedDatas.contains(data));
atlas->DrawListSharedDatas.find_erase(data);
data->FontAtlas = NULL;
}
// Update texture identifier in all active draw lists
@@ -3902,7 +3900,6 @@ void ImFontAtlasUpdateDrawListsSharedData(ImFontAtlas* atlas)
{
for (ImDrawListSharedData* shared_data : atlas->DrawListSharedDatas)
{
shared_data->FontAtlas = atlas;
shared_data->TexUvWhitePixel = atlas->TexUvWhitePixel;
shared_data->TexUvLines = atlas->TexUvLines;
}