mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-12 00:14:20 +00:00
Code Activity

Fix to allow compiling in unity builds where stb_rectpack/stb_truetype may be already included in the same compilation unit.

Browse source
This commit is contained in:
omar 2018-05-08 11:02:38 +02:00
parent f13f10e725
commit 280c05e4f8
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
imgui.cpp
View file

@ -2594,10 +2594,10 @@ float ImGui::CalcWrapWidthForPos(const ImVec2& pos, float wrap_pos_x)
//-----------------------------------------------------------------------------
void* ImGui::MemAlloc(size_t sz)
void* ImGui::MemAlloc(size_t size)
{
GImAllocatorActiveAllocationsCount++;
return GImAllocatorAllocFunc(sz, GImAllocatorUserData);
return GImAllocatorAllocFunc(size, GImAllocatorUserData);
}
void ImGui::MemFree(void* ptr)