Merge pull request #529 from v3n/master

fixed segfault in imgui with default allocator
This commit is contained in:
Branimir Karadžić 2015-09-30 19:40:06 -07:00
commit 8a1df57bfb

View file

@ -466,7 +466,7 @@ struct Imgui
_size = sizeof(s_droidSansTtf); _size = sizeof(s_droidSansTtf);
} }
IMGUI_create(_data, _size, _fontSize, _allocator); IMGUI_create(_data, _size, _fontSize, m_allocator);
m_nvg = nvgCreate(1, m_view); m_nvg = nvgCreate(1, m_view);
nvgCreateFontMem(m_nvg, "default", (unsigned char*)_data, INT32_MAX, 0); nvgCreateFontMem(m_nvg, "default", (unsigned char*)_data, INT32_MAX, 0);