Merge branch 'master' into viewport

# Conflicts:
#	imgui.cpp
This commit is contained in:
omar
2018-11-22 15:28:27 +01:00
12 changed files with 70 additions and 35 deletions

View File

@ -490,8 +490,9 @@ int main(int, char**)
ImGui_ImplVulkan_Shutdown();
ImGui_ImplSDL2_Shutdown();
ImGui::DestroyContext();
SDL_DestroyWindow(window);
CleanupVulkan();
SDL_DestroyWindow(window);
SDL_Quit();
return 0;