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

Docking: Fixed various conflicts not properly resolved on 813e0c1

Browse Source 
New git client confusion.
This commit is contained in:
omar
2019-11-27 19:27:44 +01:00
parent 4dff49b2f1
commit 28dd8d7efd
4 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/imgui_impl_vulkan.cpp
View File

@ -2,12 +2,8 @@
// This needs to be used along with a Platform Binding (e.g. GLFW, SDL, Win32, custom..)
// Implemented features:
<<<<<<< HEAD
// [X] Renderer: Support for large meshes (64k+ vertices) with 16-bits indices.
// [x] Platform: Multi-viewport / platform windows. With issues (flickering when creating a new viewport).
=======
// [X] Renderer: Support for large meshes (64k+ vertices) with 16-bit indices.
>>>>>>> master
// [x] Platform: Multi-viewport / platform windows. With issues (flickering when creating a new viewport).
// Missing features:
// [ ] Renderer: User texture binding. Changes of ImTextureID aren't supported by this binding! See https://github.com/ocornut/imgui/pull/914