Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h
This commit is contained in:
ocornut
2024-05-08 16:17:32 +02:00
25 changed files with 258 additions and 81 deletions

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.90.6 WIP
// dear imgui, v1.90.6
// (drawing and font code)
/*
@@ -391,6 +391,7 @@ void ImDrawListSharedData::SetCircleTessellationMaxError(float max_error)
}
// Initialize before use in a new frame. We always have a command ready in the buffer.
// In the majority of cases, you would want to call PushClipRect() and PushTextureID() after this.
void ImDrawList::_ResetForNewFrame()
{
// Verify that the ImDrawCmd fields we want to memcmp() are contiguous in memory.