Merge branch 'master' into docking

This commit is contained in:
ocornut
2026-07-25 13:45:27 +02:00
12 changed files with 161 additions and 111 deletions

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.92.9 WIP
// dear imgui, v1.92.9
// (drawing and font code)
/*
@@ -2286,7 +2286,7 @@ void ImDrawListSplitter::SetCurrentChannel(ImDrawList* draw_list, int idx)
void ImDrawData::Clear()
{
Valid = false;
TotalIdxCount = TotalVtxCount = 0;
FrameCount = TotalIdxCount = TotalVtxCount = 0;
CmdLists.resize(0); // The ImDrawList are NOT owned by ImDrawData but e.g. by ImGuiContext, so we don't clear them.
DisplayPos = DisplaySize = FramebufferScale = ImVec2(0.0f, 0.0f);
OwnerViewport = NULL;