From 8092f757684a97e338794525b52a1154bd996e0e Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 2 Nov 2021 13:36:06 +0200
Subject: [PATCH] Avoid incorrect access to VertexSetup while async loading
 Mesh

---
 source/core/mesh.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/core/mesh.cpp b/source/core/mesh.cpp
index 07e5e27f..467f3544 100644
--- a/source/core/mesh.cpp
+++ b/source/core/mesh.cpp
@@ -29,6 +29,8 @@ void Mesh::storage(const VertexFormat &fmt)
 
 	vertices.set_format(fmt);
 	vtx_setup.set_format(fmt);
+	if(vbuf)
+		vtx_setup.set_vertex_array(vertices);
 }
 
 void Mesh::clear()
@@ -47,7 +49,8 @@ void Mesh::check_buffers(unsigned mask)
 			delete vbuf;
 			vbuf = new Buffer;
 			vertices.use_buffer(vbuf);
-			vtx_setup.set_vertex_array(vertices);
+			if(!vertices.get_format().empty())
+				vtx_setup.set_vertex_array(vertices);
 			dirty |= VERTEX_BUFFER;
 
 #ifdef DEBUG
-- 
2.43.0