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

Merge branch 'viewport' into docking

Browse source 
# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
omar 2019-01-17 14:06:42 +01:00
commit b5144e477f
13 changed files with 138 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
imgui.cpp
View file

@ -3013,7 +3013,7 @@ bool ImGui::DebugCheckVersionAndDataLayout(const char* version, size_t sz_io, si
return !error;
}
void ImGui::SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void(*free_func)(void* ptr, void* user_data), void* user_data)
void ImGui::SetAllocatorFunctions(void* (*alloc_func)(size_t sz, void* user_data), void (*free_func)(void* ptr, void* user_data), void* user_data)
{
GImAllocatorAllocFunc = alloc_func;
GImAllocatorFreeFunc = free_func;