From 522e09f2aaf8d160b3ab1a47a17e1bb5570be1ac Mon Sep 17 00:00:00 2001 From: George Cosma Date: Thu, 7 Nov 2024 12:39:31 +0200 Subject: [PATCH] fix(core): add nullptr check to mesh destructor to avoid segfault on mesh deletion --- src/core/gpu/mesh.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/core/gpu/mesh.cpp b/src/core/gpu/mesh.cpp index ad589827..cf0ef187 100644 --- a/src/core/gpu/mesh.cpp +++ b/src/core/gpu/mesh.cpp @@ -22,6 +22,9 @@ Mesh::Mesh(std::string meshID) useMaterial = true; glDrawMode = GL_TRIANGLES; buffers = new GPUBuffers(); + + this->anim = nullptr; + this->rootNode = nullptr; } @@ -31,8 +34,12 @@ Mesh::~Mesh() meshEntries.clear(); SAFE_FREE(buffers); - ClearAnimations(anim, numAnim); - ClearRootNode(rootNode); + if (anim != nullptr) { + ClearAnimations(anim, numAnim); + } + if (rootNode != nullptr) { + ClearRootNode(rootNode); + } }