16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 01:19:19 +02:00

build 180918. imgui implementation upgraded to opengl3, opengl version requirement raised to 3.0

This commit is contained in:
tmj-fstate
2018-09-18 05:04:15 +02:00
parent 40afc461fa
commit 496a680e44
5 changed files with 20 additions and 19 deletions

View File

@@ -106,14 +106,11 @@
#include "openglmatrixstack.h"
// imgui.h comes with its own operator new which gets wrecked by dbg_new, so we temporarily disable the latter
#ifdef _MSC_VER
#ifdef _DEBUG
#ifdef DBG_NEW
#pragma push_macro("new")
#undef new
#endif // _DEBUG
#endif
#include "imgui.h"
#ifdef _MSC_VER
#ifdef _DEBUG
#define new DBG_NEW
#endif // _DEBUG
#pragma pop_macro("new")
#else
#include "imgui.h"
#endif