mirror of
https://github.com/Drezil/imgui.git
synced 2025-07-06 13:08:47 +02:00
Merge branch 'master' into docking
# Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_opengl3.cpp # docs/CHANGELOG.txt
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
// dear imgui, v1.86
|
||||
// dear imgui, v1.87 WIP
|
||||
// (main code and documentation)
|
||||
|
||||
// Help:
|
||||
@ -11264,6 +11264,7 @@ bool ImGui::SetDragDropPayload(const char* type, const void* data, size_t data_s
|
||||
}
|
||||
payload.DataFrameCount = g.FrameCount;
|
||||
|
||||
// Return whether the payload has been accepted
|
||||
return (g.DragDropAcceptFrameCount == g.FrameCount) || (g.DragDropAcceptFrameCount == g.FrameCount - 1);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user