From d3ee3e7ab51cf73dd4214b9cc4523eac04d306ec Mon Sep 17 00:00:00 2001 From: omar Date: Sat, 23 Jun 2018 09:39:05 +0200 Subject: [PATCH] Fixed merge. --- examples/imgui_impl_vulkan.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/imgui_impl_vulkan.cpp b/examples/imgui_impl_vulkan.cpp index aa01884e..aaca3532 100644 --- a/examples/imgui_impl_vulkan.cpp +++ b/examples/imgui_impl_vulkan.cpp @@ -1175,7 +1175,7 @@ static void ImGui_ImplVulkan_RenderWindow(ImGuiViewport* viewport, void*) } } - ImGui_ImplVulkan_RenderDrawData(wd->Frames[wd->FrameIndex].CommandBuffer, viewport->DrawData); + ImGui_ImplVulkan_RenderDrawData(viewport->DrawData, wd->Frames[wd->FrameIndex].CommandBuffer); { ImGui_ImplVulkanH_FrameData* fd = &wd->Frames[wd->FrameIndex];