Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-11-04 07:01:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_dx11.cpp
#	imgui.cpp
This commit is contained in:
omar
2019-08-19 21:49:53 +02:00
parent 76ccbb899d a33cedda14
commit aedcd2fb1a
13 changed files with 118 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
imgui.h
View File

@@ -1,4 +1,4 @@
// dear imgui, v1.72b
// dear imgui, v1.73 WIP
// (headers)
// See imgui.cpp file for documentation.
@@ -47,8 +47,8 @@ Index of this file:
// Version
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens)
#define IMGUI_VERSION "1.72b"
#define IMGUI_VERSION_NUM 17202
#define IMGUI_VERSION "1.73 WIP"
#define IMGUI_VERSION_NUM 17203
#define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))
#define IMGUI_HAS_VIEWPORT 1 // Viewport WIP branch
#define IMGUI_HAS_DOCK 1 // Docking WIP branch