Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-06 13:08:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut
2021-05-25 18:45:54 +02:00
parent 1b435ae3e0 04fd5072fb
commit 1ad1429c6d
10 changed files with 196 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docs/CHANGELOG.txt
View File

@ -99,6 +99,18 @@ Other changes:
Note that Linux/Mac still have inconsistent support for multi-viewports. If you want to help see https://github.com/ocornut/imgui/issues/2117.
-----------------------------------------------------------------------
VERSION 1.84 WIP (In Progress)
-----------------------------------------------------------------------
Other Changes:
- Demo: Fixed requirement in 1.83 to link with imgui_demo.cpp if IMGUI_DISABLE_METRICS_WINDOW is not set. (#4171)
Normally the right way to disable compiling the demo is to set IMGUI_DISABLE_DEMO_WINDOWS, but we want to avoid
implying that the file is required.
- Backends: OpenGL3: Handle GL_CLIP_ORIGIN on <4.5 contexts if "GL_ARB_clip_control" extension is detected. (#4170, #3998)
>>>>>>> master
-----------------------------------------------------------------------
VERSION 1.83 (Released 2011-05-24)
-----------------------------------------------------------------------