From 6412c5e0763dc079312cd5c81cb077d0c393b2b4 Mon Sep 17 00:00:00 2001 From: Branimir Karadžić Date: Tue, 8 Mar 2016 11:44:52 +0100 Subject: Update BGFX and BX (nw) --- 3rdparty/bgfx/examples/common/imgui/imgui.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to '3rdparty/bgfx/examples/common/imgui/imgui.cpp') 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 #include #include +#include #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) { -- cgit v1.2.3-70-g09d2