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

Merge branch 'master_164' into viewport_164

Browse Source 
# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
#	imgui_widgets.cpp
This commit is contained in:
omar
2018-08-31 10:28:21 +02:00
parent c83391262e 48db5713d6
commit 0c24fe276c
7 changed files with 109 additions and 86 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.64 WIP
// dear imgui, v1.64
// (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 WIP"
#define IMGUI_VERSION_NUM 16400
#define IMGUI_VERSION "1.64"
#define IMGUI_VERSION_NUM 16401
#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