Merge branch 'master' into docking

This commit is contained in:
ocornut
2025-01-31 16:10:20 +01:00
10 changed files with 47 additions and 23 deletions

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.91.8 WIP
// dear imgui, v1.91.8
// (main code and documentation)
// Help:
@@ -10973,6 +10973,11 @@ void ImGui::ErrorRecoveryTryToRecoverWindowState(const ImGuiErrorRecoveryStat
IM_ASSERT_USER_ERROR(0, "Missing EndMultiSelect()");
EndMultiSelect();
}
if (window->DC.MenuBarAppending) //-V1044
{
IM_ASSERT_USER_ERROR(0, "Missing EndMenuBar()");
EndMenuBar();
}
while (window->DC.TreeDepth > state_in->SizeOfTreeStack) //-V1044
{
IM_ASSERT_USER_ERROR(0, "Missing TreePop()");