Merge default into minor

--HG--
branch : minor
This commit is contained in:
Bart van Strien
2016-07-14 18:42:42 +02:00
19 changed files with 257 additions and 85 deletions
+1
View File
@@ -129,6 +129,7 @@ void Text::addTextData(const TextData &t)
{
voffset = 0;
draw_commands.clear();
text_data.clear();
}
uploadVertices(vertices, voffset);