mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-18 01:14:19 +00:00
Code Activity

Merge branch 'master' into docking

Browse source 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	examples/imgui_examples.sln
#	imgui.cpp
#	imgui.h
This commit is contained in:
ocornut 2021-08-30 20:01:16 +02:00
commit dedb381c51
28 changed files with 699 additions and 548 deletions
Download patch file Download diff file Expand all files Collapse all files

4
imgui_draw.cpp
View file

@ -1,4 +1,4 @@
// dear imgui, v1.84
// dear imgui, v1.85 WIP
// (drawing and font code)
/*
@ -2004,7 +2004,7 @@ void ImFontAtlas::ClearInputData()
ConfigData.clear();
CustomRects.clear();
PackIdMouseCursors = PackIdLines = -1;
TexReady = false;
// Important: we leave TexReady untouched
}
void ImFontAtlas::ClearTexData()