Browse Source

check for nullptr when freeing simple mesh

testing
cinnaboot 6 years ago
parent
commit
37f8ad93d4
  1. 3
      src/entity.cpp
  2. 1
      src/mesh.cpp
  3. 3
      src/renderer.cpp

3
src/entity.cpp

@ -51,7 +51,8 @@ entFree(entity& e)
roFree(e.render_objs); roFree(e.render_objs);
e.render_objs = nullptr; e.render_objs = nullptr;
meFreeMeshGroup(e.meshes); meFreeMeshGroup(e.meshes);
meFreeSimpleMesh(e.mesh);
if (e.mesh != nullptr) meFreeSimpleMesh(e.mesh);
e.mesh = nullptr; e.mesh = nullptr;
} }

1
src/mesh.cpp

@ -94,6 +94,7 @@ meFreeMeshGroup(mesh_group& mesh_group)
void void
meFreeSimpleMesh(simple_mesh* mesh) meFreeSimpleMesh(simple_mesh* mesh)
{ {
assert(mesh != nullptr);
utilSafeFree(mesh->vertices); utilSafeFree(mesh->vertices);
mesh->vertices = nullptr; mesh->vertices = nullptr;
utilSafeFree(mesh->vert_colors); utilSafeFree(mesh->vert_colors);

3
src/renderer.cpp

@ -1,7 +1,4 @@
#include <vector>
#include <cmath> // trig functions
#if defined (_WIN32) #if defined (_WIN32)
#include <SDL.h> #include <SDL.h>
#else #else

Loading…
Cancel
Save