This commit is contained in:
milek7
2018-07-11 14:38:34 +02:00
parent 59cea820b0
commit 7299fc866e
6 changed files with 24 additions and 10 deletions

View File

@@ -107,4 +107,11 @@
#define glDebug(x) if (GLEW_GREMEDY_string_marker) glStringMarkerGREMEDY(0, __FILE__ ":" STRINGIZE(__LINE__) ": " x);
#endif
#ifdef DBG_NEW
#pragma push_macro("new")
#undef new
#include "imgui/imgui.h"
#pragma pop_macro("new")
#else
#include "imgui/imgui.h"
#endif