Bläddra i källkod

Merge pull request #2263 from migenius/migenius-fix-nulltexcheck

Add check for NULL texcoord values in glTF2.
Kim Kulling 6 år sedan
förälder
incheckning
2f09d7f670
1 ändrade filer med 6 tillägg och 0 borttagningar
  1. 6 0
      code/glTF2Importer.cpp

+ 6 - 0
code/glTF2Importer.cpp

@@ -439,6 +439,12 @@ void glTF2Importer::ImportMeshes(glTF2::Asset& r)
             }
             }
 
 
             for (size_t tc = 0; tc < attr.texcoord.size() && tc < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++tc) {
             for (size_t tc = 0; tc < attr.texcoord.size() && tc < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++tc) {
+                if (!attr.texcoord[tc]) {
+                    DefaultLogger::get()->warn("NULL texcoord encountered in mesh \"" + mesh.name +
+                        "\" and will be ignored");
+                    continue;
+                }
+
                 if (attr.texcoord[tc]->count != aim->mNumVertices) {
                 if (attr.texcoord[tc]->count != aim->mNumVertices) {
                     DefaultLogger::get()->warn("Texcoord stream size in mesh \"" + mesh.name +
                     DefaultLogger::get()->warn("Texcoord stream size in mesh \"" + mesh.name +
                                                "\" does not match the vertex count");
                                                "\" does not match the vertex count");