mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-22 01:54:21 +00:00
Code Activity

Merge branch 'master' into viewport

Browse source 
# Conflicts:
#	examples/imgui_impl_sdl.cpp
This commit is contained in:
omar 2019-01-02 19:00:31 +01:00
commit 951c9dd68b
13 changed files with 206 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

1
examples/imgui_impl_win32.cpp
View file

@ -194,6 +194,7 @@ static void ImGui_ImplWin32_UpdateMousePos()
void ImGui_ImplWin32_NewFrame()
{
ImGuiIO& io = ImGui::GetIO();
IM_ASSERT(io.Fonts->IsBuilt() && "Font atlas not built! It is generally built by the renderer back-end. Missing call to renderer _NewFrame() function? e.g. ImGui_ImplOpenGL3_NewFrame().");
// Setup display size (every frame to accommodate for window resizing)
RECT rect;