Updated ImGui.

This commit is contained in:
Branimir Karadžić 2017-09-12 21:16:19 -07:00
parent 634d5ef751
commit 17cd4fd005
2 changed files with 5 additions and 4 deletions

View File

@ -2360,8 +2360,9 @@ void ImGui::NewFrame()
CloseInactivePopups();
// Create implicit window - we will only render it if the user has added something to it.
// We don't use "Debug" to avoid colliding with user trying to create a "Debug" window with custom flags.
ImGui::SetNextWindowSize(ImVec2(400,400), ImGuiCond_FirstUseEver);
ImGui::Begin("Debug");
ImGui::Begin("Debug##Default");
}
void ImGui::Initialize()

View File

@ -21,10 +21,10 @@
#if !defined(alloca)
#ifdef _WIN32
#include <malloc.h> // alloca
#elif !defined(__GLIBC__)
#include <stdlib.h> // alloca
#elif defined(__GLIBC__) || defined(__sun)
#include <alloca.h> // alloca
#else
#include <alloca.h> // alloca. glibc has an alloca specific header
#include <stdlib.h> // alloca
#endif
#endif