mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-28 02:50:06 +00:00
Merge branch 'master' into docking (incl merge moved CurrentDpiScale field)
# Conflicts: # backends/imgui_impl_osx.mm # backends/imgui_impl_win32.cpp # imgui.cpp
This commit is contained in:
commit
eabe98f6d5
28 changed files with 164 additions and 66 deletions
|
|
@ -726,6 +726,7 @@ void ImGui_ImplWGPU_InvalidateDeviceObjects()
|
|||
bool ImGui_ImplWGPU_Init(ImGui_ImplWGPU_InitInfo* init_info)
|
||||
{
|
||||
ImGuiIO& io = ImGui::GetIO();
|
||||
IMGUI_CHECKVERSION();
|
||||
IM_ASSERT(io.BackendRendererUserData == nullptr && "Already initialized a renderer backend!");
|
||||
|
||||
// Setup backend capabilities flags
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue