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

@ -69,7 +69,7 @@ static void ImGui_ImplGlfwGL3_RenderDrawLists(ImDrawList** const cmd_lists, int
if (g_VboSize < needed_vtx_size)
{
g_VboSize = needed_vtx_size + 5000 * sizeof(ImDrawVert); // Grow buffer
glBufferData(GL_ARRAY_BUFFER, g_VboSize, NULL, GL_STREAM_DRAW);
glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)g_VboSize, NULL, GL_STREAM_DRAW);
}
// Copy and convert all vertices into a single contiguous buffer