LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 08:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '12.0-development' into GraphicsBuffer

Browse Source
This commit is contained in:
Alex Szpakowski
2020-02-28 23:10:21 -04:00
parent d77dabaa6b e188740c18
commit 7fbb68e90e
32 changed files with 338 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Mesh.cpp
+1 -1
View File
@@ -552,7 +552,7 @@ void Mesh::drawInstanced(Graphics *gfx, const Matrix4 &m, int instancecount)
if (instancecount > 1 && !gfx->getCapabilities().features[Graphics::FEATURE_INSTANCING])
throw love::Exception("Instancing is not supported on this system.");
gfx->flushStreamDraws();
gfx->flushBatchedDraws();
if (Shader::isDefaultActive())
Shader::attachDefault(Shader::STANDARD_DEFAULT);