Merge branch '12.0-development' into GraphicsBuffer

This commit is contained in:
Alex Szpakowski
2020-02-28 23:10:21 -04:00
32 changed files with 338 additions and 332 deletions
+1 -1
View File
@@ -249,7 +249,7 @@ void Text::draw(Graphics *gfx, const Matrix4 &m)
if (vertex_buffer == nullptr || draw_commands.empty())
return;
gfx->flushStreamDraws();
gfx->flushBatchedDraws();
if (Shader::isDefaultActive())
Shader::attachDefault(Shader::STANDARD_DEFAULT);