Merge branch 'master' into viewport

This commit is contained in:
omar
2018-11-05 17:28:46 +01:00
23 changed files with 83 additions and 25 deletions

View File

@ -12,6 +12,8 @@
// The aim of imgui_impl_vulkan.h/.cpp is to be usable in your engine without any modification.
// IF YOU FEEL YOU NEED TO MAKE ANY CHANGE TO THIS CODE, please share them and your feedback at https://github.com/ocornut/imgui/
#pragma once
#include <vulkan/vulkan.h>
#define IMGUI_VK_QUEUED_FRAMES 2