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

Conflicts:
	examples/opengl_example/imgui_impl_glfw.cpp
This commit is contained in:
ocornut
2015-07-04 12:44:25 -06:00
5 changed files with 76 additions and 9 deletions

View File

@ -76,7 +76,7 @@ static void ImGui_ImplGlfw_RenderDrawLists(ImDrawList** const cmd_lists, int cmd
{
glBindTexture(GL_TEXTURE_2D, (GLuint)(intptr_t)pcmd->texture_id);
glScissor((int)pcmd->clip_rect.x, (int)(height - pcmd->clip_rect.w), (int)(pcmd->clip_rect.z - pcmd->clip_rect.x), (int)(pcmd->clip_rect.w - pcmd->clip_rect.y));
glDrawElements(GL_TRIANGLES, pcmd->idx_count, GL_UNSIGNED_SHORT, idx_buffer);
glDrawElements(GL_TRIANGLES, (GLsizei)pcmd->idx_count, GL_UNSIGNED_SHORT, idx_buffer);
}
idx_buffer += pcmd->idx_count;
}