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

Fix love.graphics.draw(TextBatch) accessing an invalid pointer.

Browse Source 
Fixes #1922.
Fixes #1914.
This commit is contained in:
Sasha Szpakowski
2023-04-22 21:59:15 -03:00
parent 7613067f21
commit 90b22f7d42
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/TextBatch.cpp
+4 -4
View File
@@ -255,6 +255,10 @@ void TextBatch::draw(Graphics *gfx, const Matrix4 &m)
gfx->flushBatchedDraws();
// Re-generate the text if the Font's texture cache was invalidated.
if (font->getTextureCacheID() != textureCacheID)
regenerateVertices();
if (Shader::isDefaultActive())
Shader::attachDefault(Shader::STANDARD_DEFAULT);
@@ -265,10 +269,6 @@ void TextBatch::draw(Graphics *gfx, const Matrix4 &m)
if (Shader::current)
Shader::current->validateDrawState(PRIMITIVE_TRIANGLES, firsttex);
// Re-generate the text if the Font's texture cache was invalidated.
if (font->getTextureCacheID() != textureCacheID)
regenerateVertices();
int totalverts = 0;
for (const Font::DrawCommand &cmd : drawCommands)
totalverts = std::max(cmd.startvertex + cmd.vertexcount, totalverts);