Merge branch 'master' into issue_2661

2019-09-23 16:59:28 +02:00
parent 720ac4846b 74ac8676e2
commit 3b2e0ebfc7
8 changed files with 23 additions and 30 deletions
--- a/code/glTF2/glTF2Importer.cpp
+++ b/code/glTF2/glTF2Importer.cpp
@@ -385,7 +385,7 @@ void glTF2Importer::ImportMeshes(glTF2::Asset& r)
            aim->mName = mesh.name.empty() ? mesh.id : mesh.name;

            if (mesh.primitives.size() > 1) {
-                size_t& len = aim->mName.length;
+                ai_uint32& len = aim->mName.length;
                aim->mName.data[len] = '-';
                len += 1 + ASSIMP_itoa10(aim->mName.data + len + 1, unsigned(MAXLEN - len - 1), p);
            }