浏览代码

Fixup for previous commit. This is a better way to do it.

Dario Manesku 10 年之前
父节点
当前提交
8f31098c40
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 1
      3rdparty/ocornut-imgui/imgui.cpp
  2. 1 0
      examples/common/imgui/ocornut_imgui.cpp

+ 1 - 1
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.

+ 1 - 0
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;