Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

Imgui
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

20360e00

Commit 20360e00 authored 5 months ago by ocornut

Downloads
- Patches
- Plain Diff

Merge miscellaneous small changes to reduce drift with texture update branch.

- ImGuiDebugLogFlags_EventFont is yet unused.

parent 551b6c4d

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

backends/imgui_impl_opengl3.cpp 2 additions, 1 deletion

backends/imgui_impl_opengl3.cpp
imgui.cpp 15 additions, 13 deletions

imgui.cpp
imgui.h 12 additions, 7 deletions

imgui.h
imgui_draw.cpp 52 additions, 38 deletions

imgui_draw.cpp
imgui_internal.h 13 additions, 12 deletions

imgui_internal.h
misc/freetype/imgui_freetype.cpp 1 addition, 0 deletions

misc/freetype/imgui_freetype.cpp

with 95 additions and 71 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment