Fonts: Fixed ImFontAtlas::ClearInputData() marking atlas as not built. (

ocornut#4455, ocornut#3487)
AnClark · Aug 30, 2021 · 5d63f1b · 5d63f1b
1 parent 39d19e6
commit 5d63f1b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -44,8 +44,9 @@ Other Changes:
 
 - InputTextMultiline: Fixed label size not being included into window contents rect unless
   the whole widget is clipped.
-- imgui_freetype: Fixed crash when FT_Render_Glyph() fails to render a glyph and returns NULL
+- Fonts: imgui_freetype: Fixed crash when FT_Render_Glyph() fails to render a glyph and returns NULL
   (which apparently happens with Freetype 2.11). (#4394, #4145?).
+- Fonts: Fixed ImFontAtlas::ClearInputData() marking atlas as not built. (#4455, #3487)
 - Backends: OpenGL3: Fixed our new GL loader conflicting with user using GL3W. (#4445)
 - Backends: WebGPU: Fixed for latest specs. (#4472) [@Kangz]
 

diff --git a/imgui.h b/imgui.h
@@ -61,7 +61,7 @@ Index of this file:
 // Version
 // (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens)
 #define IMGUI_VERSION               "1.85 WIP"
-#define IMGUI_VERSION_NUM           18406
+#define IMGUI_VERSION_NUM           18407
 #define IMGUI_CHECKVERSION()        ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))
 #define IMGUI_HAS_TABLE
 

diff --git a/imgui_draw.cpp b/imgui_draw.cpp
@@ -1998,7 +1998,7 @@ void    ImFontAtlas::ClearInputData()
     ConfigData.clear();
     CustomRects.clear();
     PackIdMouseCursors = PackIdLines = -1;
-    TexReady = false;
+    // Important: we leave TexReady untouched
 }
 
 void    ImFontAtlas::ClearTexData()