mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-08-25 08:31:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	imgui.cpp
This commit is contained in:
ocornut
2026-08-04 14:34:04 +02:00
parent 98a66d8c88 2de0a07cd4
commit 11bd4e7731
42 changed files with 2048 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backends/imgui_impl_opengl2.cpp
View File

@@ -282,8 +282,7 @@ void ImGui_ImplOpenGL2_UpdateTexture(ImTextureData* tex)
const void* pixels = tex->GetPixels();
GLuint gl_texture_id = 0;
// Upload texture to graphics system
// (Bilinear sampling is required by default. Set 'io.Fonts->Flags |= ImFontAtlasFlags_NoBakedLines' or 'style.AntiAliasedLinesUseTex = false' to allow point/nearest sampling)
// Upload texture to graphics system (bilinear sampling is required).
GLint last_texture;
GL_CALL(glGetIntegerv(GL_TEXTURE_BINDING_2D, &last_texture));
GL_CALL(glGenTextures(1, &gl_texture_id));