ocornut
|
1b215ecb01
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
3 years ago |
|
ocornut
|
dde31030e9
|
Backends: SDL_Renderer: use SDL_RenderIsClipEnabled() to pass NULL to SDL_RenderSetClipRect (#3926, #4582, #4633)
|
3 years ago |
|
ocornut
|
1780579403
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
3 years ago |
|
ocornut
|
e443ea139d
|
Backends: SDL_Renderer: Backup and restore modified ClipRect/Viewport. (#3926, #4582)
|
3 years ago |
|
ocornut
|
835a5344b0
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
3 years ago |
|
ocornut
|
fba756176d
|
Backends: SDL_Renderer: Amend 1d2d246, various tweaks, fixes, sync to latest. (#3926)
|
3 years ago |
Sylvain
|
62b17f928e
|
Backends: SDL_Renderer: Added renderer backend for SDL 2.0.17+ (#3926)
(Squashed 20 commits)
|
3 years ago |