mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-30 03:10:06 +00:00
Merge branch 'master' into docking
# Conflicts: # backends/imgui_impl_dx12.cpp # backends/imgui_impl_vulkan.cpp
This commit is contained in:
commit
015186aaf8
18 changed files with 124 additions and 106 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.91.7
|
||||
// dear imgui, v1.91.8 WIP
|
||||
// (main code and documentation)
|
||||
|
||||
// Help:
|
||||
|
|
@ -5269,6 +5269,7 @@ void ImGui::UpdateHoveredWindowAndCaptureFlags()
|
|||
}
|
||||
|
||||
// Called once a frame. Followed by SetCurrentFont() which sets up the remaining data.
|
||||
// FIXME-VIEWPORT: the concept of a single ClipRectFullscreen is not ideal!
|
||||
static void SetupDrawListSharedData()
|
||||
{
|
||||
ImGuiContext& g = *GImGui;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue