Merge default into minor

--HG--
branch : minor
This commit is contained in:
Bart van Strien
2014-09-03 18:11:20 +02:00
3 changed files with 9 additions and 3 deletions
+4 -1
View File
@@ -233,7 +233,10 @@ void SpriteBatch::setBufferSize(int newsize)
}
// Copy as much of the old data into the new VertexBuffer as can fit.
new_array_buf->fill(0, sizeof(Vertex) * 4 * std::min(newsize, size), old_data);
{
VertexBuffer::Bind bind(*new_array_buf);
new_array_buf->fill(0, sizeof(Vertex) * 4 * std::min(newsize, size), old_data);
}
// We don't need to unmap the old VertexBuffer since we're deleting it.
delete array_buf;