summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bgfx/examples/common/imgui/imgui.cpp
diff options
context:
space:
mode:
author Branimir Karadžić <branimirkaradzic@gmail.com>2016-03-08 11:44:52 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-03-08 12:58:10 +0100
commit6412c5e0763dc079312cd5c81cb077d0c393b2b4 (patch)
treeed41c94128216146df63c43cd8a5965897557175 /3rdparty/bgfx/examples/common/imgui/imgui.cpp
parent1f352c6af853e5cb0dc06ea6596be77db953a9fd (diff)
Update BGFX and BX (nw)
Diffstat (limited to '3rdparty/bgfx/examples/common/imgui/imgui.cpp')
-rw-r--r--3rdparty/bgfx/examples/common/imgui/imgui.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/3rdparty/bgfx/examples/common/imgui/imgui.cpp b/3rdparty/bgfx/examples/common/imgui/imgui.cpp
index 4cdc5f30fe5..60afe3df290 100644
--- a/3rdparty/bgfx/examples/common/imgui/imgui.cpp
+++ b/3rdparty/bgfx/examples/common/imgui/imgui.cpp
@@ -28,6 +28,7 @@
#include <bx/uint32_t.h>
#include <bx/fpumath.h>
#include <bx/handlealloc.h>
+#include <bx/crtimpl.h>
#include "imgui.h"
#include "ocornut_imgui.h"
@@ -454,11 +455,13 @@ struct Imgui
{
m_allocator = _allocator;
- if (NULL == m_allocator)
+#if BX_CONFIG_ALLOCATOR_CRT
+ if (NULL == _allocator)
{
static bx::CrtAllocator allocator;
m_allocator = &allocator;
}
+#endif // BX_CONFIG_ALLOCATOR_CRT
if (NULL == _data)
{