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

Merge branch 'master' into viewport

Browse source 
# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	imgui.cpp
#	imgui.h
This commit is contained in:
omar 2018-05-07 22:23:58 +02:00
commit 4ff23d3306
25 changed files with 671 additions and 514 deletions
Download patch file Download diff file Expand all files Collapse all files

3
examples/directx9_example/main.cpp
View file

@ -75,7 +75,8 @@ int main(int, char**)
return 0;
}
// Setup ImGui binding
// Setup Dear ImGui binding
IMGUI_CHECKVERSION();
ImGui::CreateContext();
ImGuiIO& io = ImGui::GetIO(); (void)io;
//io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; // Enable Keyboard Controls