Merge branch 'master' into viewport

This commit is contained in:
omar
2018-09-05 11:08:57 +02:00
9 changed files with 78 additions and 76 deletions

View File

@ -1,4 +1,4 @@
// dear imgui, v1.64
// dear imgui, v1.65 WIP
// (headers)
// See imgui.cpp file for documentation.
@ -23,8 +23,8 @@
// Version
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY00 then bounced up to XYY01 when release tagging happens)
#define IMGUI_VERSION "1.64"
#define IMGUI_VERSION_NUM 16401
#define IMGUI_VERSION "1.65 WIP"
#define IMGUI_VERSION_NUM 16500
#define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert))
#define IMGUI_HAS_VIEWPORT 1 // Viewport WIP branch