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' into docking

Browse Source 
# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
omar
2020-02-10 14:03:12 +01:00
parent 7e2d172ae5 58b3e02b95
commit 8432d1bfc7
12 changed files with 93 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
imgui.h
View File

@ -1,4 +1,4 @@
// dear imgui, v1.75 WIP
// dear imgui, v1.75
// (headers)
// Help:
@ -46,6 +46,8 @@ Index of this file:
#include "imconfig.h"
#endif
#ifndef IMGUI_DISABLE
//-----------------------------------------------------------------------------
// Header mess
//-----------------------------------------------------------------------------
@ -58,8 +60,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.75 WIP"
#define IMGUI_VERSION_NUM 17401
#define IMGUI_VERSION "1.75"
#define IMGUI_VERSION_NUM 17500
#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
@ -2494,3 +2496,5 @@ struct ImGuiViewport
#ifdef IMGUI_INCLUDE_IMGUI_USER_H
#include "imgui_user.h"
#endif
#endif // #ifndef IMGUI_DISABLE