Merge branch 'master' into a-bunch-of-fixes

2018-11-29 20:34:13 +01:00
parent 4f767ecd13 ef8b61237d
commit ebcea3cb02
1 changed files with 7 additions and 0 deletions
--- a/code/glTF2Asset.inl
+++ b/code/glTF2Asset.inl
@@ -1357,6 +1357,13 @@ inline void Asset::Load(const std::string& pFile, bool isBinary)
        }
    }

+    // Force reading of skins since they're not always directly referenced
+    if (Value* skinsArray = FindArray(doc, "skins")) {
+        for (unsigned int i = 0; i < skinsArray->Size(); ++i) {
+            skins.Retrieve(i);
+        }
+    }
+
    if (Value* animsArray = FindArray(doc, "animations")) {
        for (unsigned int i = 0; i < animsArray->Size(); ++i) {
            animations.Retrieve(i);