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

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
omar
2019-10-04 19:22:42 +02:00
parent 6994bf10bc ee3373d067
commit e0c0e53edf
15 changed files with 218 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/imgui_impl_opengl3.cpp
View File

@ -179,7 +179,7 @@ bool ImGui_ImplOpenGL3_Init(const char* glsl_version)
gl_loader = "GLEW";
#elif defined(IMGUI_IMPL_OPENGL_LOADER_GLAD)
gl_loader = "GLAD";
#else IMGUI_IMPL_OPENGL_LOADER_CUSTOM
#else // IMGUI_IMPL_OPENGL_LOADER_CUSTOM
gl_loader = "Custom";
#endif