Merge branch 'master' into docking

This commit is contained in:
ocornut
2024-12-11 15:08:31 +01:00
9 changed files with 32 additions and 32 deletions

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.91.6 WIP
// dear imgui, v1.91.6
// (main code and documentation)
// Help:
@@ -4855,15 +4855,15 @@ void ImGui::DebugAllocHook(ImGuiDebugAllocInfo* info, int frame_count, void* ptr
}
if (size != (size_t)-1)
{
//printf("[%05d] MemAlloc(%d) -> 0x%p\n", frame_count, (int)size, ptr);
entry->AllocCount++;
info->TotalAllocCount++;
//printf("[%05d] MemAlloc(%d) -> 0x%p\n", frame_count, size, ptr);
}
else
{
//printf("[%05d] MemFree(0x%p)\n", frame_count, ptr);
entry->FreeCount++;
info->TotalFreeCount++;
//printf("[%05d] MemFree(0x%p)\n", frame_count, ptr);
}
}