mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-04-20 14:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	examples/README.txt
#	examples/imgui_impl_dx9.cpp
#	imgui.cpp
#	imgui.h
This commit is contained in:
omar
2019-05-06 10:16:43 +02:00
parent 4f22a45cb5 d88121ff5b
commit 76e61958fd
15 changed files with 349 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/imgui_impl_dx9.cpp
View File

@@ -226,6 +226,7 @@ bool ImGui_ImplDX9_Init(IDirect3DDevice9* device)
io.BackendRendererName = "imgui_impl_dx9";
g_pd3dDevice = device;
g_pd3dDevice->AddRef();
if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
ImGui_ImplDX9_InitPlatformInterface();