Merge fix.

This commit is contained in:
omar 2018-01-15 20:18:01 +01:00
parent a221d253f3
commit 05885b2e6d

View File

@ -3869,7 +3869,7 @@ void ImGui::Render()
AddWindowToDrawDataSelectLayer(window); AddWindowToDrawDataSelectLayer(window);
} }
if (g.NavWindowingTarget && g.NavWindowingTarget->Active && g.NavWindowingTarget->HiddenFrames <= 0) // NavWindowingTarget is always temporarily displayed as the front-most window if (g.NavWindowingTarget && g.NavWindowingTarget->Active && g.NavWindowingTarget->HiddenFrames <= 0) // NavWindowingTarget is always temporarily displayed as the front-most window
AddWindowToDrawDataSelectLayer(&g.DrawDataBuilder, g.NavWindowingTarget); AddWindowToDrawDataSelectLayer(g.NavWindowingTarget);
g.DrawDataBuilder.FlattenIntoSingleLayer(); g.DrawDataBuilder.FlattenIntoSingleLayer();
// Draw software mouse cursor if requested // Draw software mouse cursor if requested