Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-05 04:28:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives

Browse Source 
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	examples/directx9_example/imgui_impl_dx9.cpp
	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
	examples/opengl_example/imgui_impl_glfw.cpp
	imgui.cpp
This commit is contained in:
ocornut
2015-07-07 12:15:35 -06:00
parent 4d42760c0b 502e360ee5
commit 25882c47a3
7 changed files with 217 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/directx11_example/imgui_impl_dx11.cpp
View File

@ -119,7 +119,7 @@ static void ImGui_ImplDX11_RenderDrawLists(ImDrawData* draw_data)
for (int n = 0; n < draw_data->cmd_lists_count; n++)
{
const ImDrawList* cmd_list = draw_data->cmd_lists[n];
for (size_t cmd_i = 0; cmd_i < cmd_list->cmd_buffer.size(); cmd_i++)
for (int cmd_i = 0; cmd_i < cmd_list->cmd_buffer.size(); cmd_i++)
{
const ImDrawCmd* pcmd = &cmd_list->cmd_buffer[cmd_i];
if (pcmd->user_callback)