mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-02-02 03:40:06 +00:00
Code 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
commit 8432d1bfc7
12 changed files with 93 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
imgui.cpp
View file

@ -1,4 +1,4 @@
// dear imgui, v1.75 WIP
// dear imgui, v1.75
// (main code and documentation)
// Help:
@ -802,6 +802,8 @@ CODE
#endif
#include "imgui.h"
#ifndef IMGUI_DISABLE
#ifndef IMGUI_DEFINE_MATH_OPERATORS
#define IMGUI_DEFINE_MATH_OPERATORS
#endif
@ -15566,3 +15568,5 @@ void ImGui::ShowMetricsWindow(bool*) { }
#endif
//-----------------------------------------------------------------------------
#endif // #ifndef IMGUI_DISABLE