Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-12 15:59:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into viewport

Browse Source 
# Conflicts:
#	imgui.cpp
This commit is contained in:
omar
2018-06-26 12:41:36 +02:00
parent d3ee3e7ab5 79153cf19f
commit c38fe6b0e1
10 changed files with 89 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/imgui_impl_dx12.cpp
View File

@ -369,7 +369,7 @@ static void ImGui_ImplDX12_CreateFontsTexture()
}
// Store our identifier
static_assert(sizeof(ImTextureID) >= sizeof(g_hFontSrvGpuDescHandle.ptr), "Can't pack descriptor handle into TexID");
static_assert(sizeof(ImTextureID) >= sizeof(g_hFontSrvGpuDescHandle.ptr), "Can't pack descriptor handle into TexID, 32-bit not supported yet.");
io.Fonts->TexID = (void *)g_hFontSrvGpuDescHandle.ptr;
}