Don't delete textures that were never loaded on a model

stuarthayhurst · Jul 29, 2024 · ac75e50 · ac75e50
1 parent 1f448a0
commit ac75e50
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/ammonite/graphics/textures.cpp b/src/ammonite/graphics/textures.cpp
@@ -88,7 +88,7 @@ namespace ammonite {
       }
 
       /*
-       - Create a texture with from the data given, return its ID
+       - Create a texture from the data given, return its ID
        - This doesn't generate the mipmaps, but allocates space for them
        - externalSuccess is written to on failure
       */

diff --git a/src/ammonite/models/models.cpp b/src/ammonite/models/models.cpp
@@ -381,8 +381,13 @@ namespace ammonite {
         if (modelObjectData->refCount < 1) {
           //Reduce reference count on textures
           for (unsigned int i = 0; i < modelObjectData->meshes.size(); i++) {
-            ammonite::textures::internal::deleteTexture(modelObject->textureIds[i].diffuseId);
-            ammonite::textures::internal::deleteTexture(modelObject->textureIds[i].specularId);
+            if (modelObject->textureIds[i].diffuseId != -1) {
+              ammonite::textures::internal::deleteTexture(modelObject->textureIds[i].diffuseId);
+            }
+
+            if (modelObject->textureIds[i].specularId != -1) {
+              ammonite::textures::internal::deleteTexture(modelObject->textureIds[i].specularId);
+            }
           }
 
           //Free the data if it hasn't been already