From 8f31098c409cadadc4e2ab9550f1cc81c8e47341 Mon Sep 17 00:00:00 2001 From: Dario Manesku Date: Sun, 5 Apr 2015 09:04:16 +0200 Subject: [PATCH] Fixup for previous commit. This is a better way to do it. --- 3rdparty/ocornut-imgui/imgui.cpp | 2 +- examples/common/imgui/ocornut_imgui.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/3rdparty/ocornut-imgui/imgui.cpp b/3rdparty/ocornut-imgui/imgui.cpp index f50e36501..8a26d9cff 100644 --- a/3rdparty/ocornut-imgui/imgui.cpp +++ b/3rdparty/ocornut-imgui/imgui.cpp @@ -1905,7 +1905,7 @@ void ImGui::NewFrame() g.CurrentWindowStack.resize(0); // Create implicit window - we will only render it if the user has added something to it. - ImGui::Begin("Debug", NULL, ImVec2(400,400), -1.0f, ImGuiWindowFlags_NoSavedSettings); + ImGui::Begin("Debug", NULL, ImVec2(400,400)); } // NB: behaviour of ImGui after Shutdown() is not tested/guaranteed at the moment. This function is merely here to free heap allocations. diff --git a/examples/common/imgui/ocornut_imgui.cpp b/examples/common/imgui/ocornut_imgui.cpp index 19726040b..c12b494e4 100644 --- a/examples/common/imgui/ocornut_imgui.cpp +++ b/examples/common/imgui/ocornut_imgui.cpp @@ -86,6 +86,7 @@ struct OcornutImguiContext ImGuiIO& io = ImGui::GetIO(); io.DisplaySize = ImVec2(1280.0f, 720.0f); io.DeltaTime = 1.0f / 60.0f; + io.IniFilename = NULL; // io.PixelCenterOffset = bgfx::RendererType::Direct3D9 == bgfx::getRendererType() ? -0.5f : 0.0f; const bgfx::Memory* vsmem;