mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-10-09 03:26:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ocornut/imgui

Browse Source
This commit is contained in:
gzito
2015-10-14 23:01:52 +02:00
parent 50b25b6c75 5d53f37a5d
commit 79ca203850
23 changed files with 283 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
imgui_draw.cpp
View File

@@ -26,7 +26,7 @@
#endif
#endif
#if defined(_MSC_VER) && !defined(__S3E__)
#if defined(_MSC_VER)
#pragma warning (disable: 4505) // unreferenced local function has been removed (stb stuff)
#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
#define snprintf _snprintf
@@ -291,6 +291,7 @@ void ImDrawList::ChannelsMerge()
void ImDrawList::ChannelsSetCurrent(int idx)
{
IM_ASSERT(idx < _ChannelsCount);
if (_ChannelsCurrent == idx) return;
memcpy(&_Channels.Data[_ChannelsCurrent].CmdBuffer, &CmdBuffer, sizeof(CmdBuffer)); // copy 12 bytes, four times
memcpy(&_Channels.Data[_ChannelsCurrent].IdxBuffer, &IdxBuffer, sizeof(IdxBuffer));