hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-12 08:00:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed scorescreen page flip issue.

Browse Source
This commit is contained in:
Justin Marshall
2020-06-14 18:58:32 -07:00
parent c9e027e1a0
commit 393bc868f6
5 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/external/imgui/imgui.cpp
Vendored
+13 -8
View File
@@ -3734,7 +3734,7 @@ ImGuiKeyModFlags ImGui::GetMergedKeyModFlags()
return key_mod_flags;
}
void ImGui::NewFrame()
void ImGui::NewFrame(bool clearCmdList)
{
IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() and ImGui::SetCurrentContext() ?");
ImGuiContext& g = *GImGui;
@@ -3777,16 +3777,21 @@ void ImGui::NewFrame()
if (g.IO.BackendFlags & ImGuiBackendFlags_RendererHasVtxOffset)
g.DrawListSharedData.InitialFlags |= ImDrawListFlags_AllowVtxOffset;
g.BackgroundDrawList.ResetForNewFrame();
g.BackgroundDrawList.PushTextureID(g.IO.Fonts->TexID);
g.BackgroundDrawList.PushClipRectFullScreen();
g.ForegroundDrawList.ResetForNewFrame();
g.ForegroundDrawList.PushTextureID(g.IO.Fonts->TexID);
g.ForegroundDrawList.PushClipRectFullScreen();
// Mark rendering data as invalid to prevent user who may have a handle on it to use it.
g.DrawData.Clear();
if (clearCmdList) {
g.BackgroundDrawList.ResetForNewFrame();
g.BackgroundDrawList.PushClipRectFullScreen();
g.ForegroundDrawList.ResetForNewFrame();
g.ForegroundDrawList.PushClipRectFullScreen();
g.DrawData.Clear();
}
g.BackgroundDrawList.PushTextureID(g.IO.Fonts->TexID);
g.ForegroundDrawList.PushTextureID(g.IO.Fonts->TexID);
// Drag and drop keep the source ID alive so even if the source disappear our state is consistent
if (g.DragDropActive && g.DragDropPayload.SourceId == g.ActiveId)