Merge branch 'master' into docking

# Conflicts:
#	examples/imgui_impl_metal.h
#	examples/imgui_impl_metal.mm
This commit is contained in:
omar
2019-05-30 16:47:11 +02:00
4 changed files with 12 additions and 10 deletions

View File

@ -3,6 +3,7 @@
// Implemented features:
// [X] Renderer: User texture binding. Use 'MTLTexture' as ImTextureID. Read the FAQ about ImTextureID in imgui.cpp.
// [X] Renderer: Support for large meshes (64k+ vertices) with 16-bits indices.
// Missing features:
// [ ] Renderer: Multi-viewport / platform windows.