mirror of
https://github.com/ocornut/imgui.git
synced 2026-02-08 04:40:09 +00:00
Merge branch 'context'
# Conflicts: # examples/allegro5_example/main.cpp # examples/directx10_example/main.cpp # examples/directx11_example/main.cpp # examples/directx9_example/main.cpp # examples/marmalade_example/main.cpp # examples/opengl2_example/main.cpp # examples/opengl3_example/main.cpp # examples/sdl_opengl2_example/main.cpp # examples/sdl_opengl3_example/main.cpp # examples/vulkan_example/main.cpp
This commit is contained in:
commit
f0364aa359
24 changed files with 122 additions and 69 deletions
|
|
@ -201,7 +201,6 @@ bool ImGui_ImplA5_Init(ALLEGRO_DISPLAY* display)
|
|||
void ImGui_ImplA5_Shutdown()
|
||||
{
|
||||
ImGui_ImplA5_InvalidateDeviceObjects();
|
||||
ImGui::Shutdown();
|
||||
}
|
||||
|
||||
// You can read the io.WantCaptureMouse, io.WantCaptureKeyboard flags to tell if dear imgui wants to use your inputs.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue