Merge branch 'master' into viewport

# Conflicts:
#	examples/example_glfw_opengl3/main.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h
This commit is contained in:
omar
2018-08-29 17:40:52 +02:00
16 changed files with 522 additions and 393 deletions

View File

@ -16,6 +16,7 @@
#define IMGUI_VK_QUEUED_FRAMES 2
// Please zero-clear before use.
struct ImGui_ImplVulkan_InitInfo
{
VkInstance Instance;