Merge pull request #2419 from merwaaan/fix-fbx-face-material

Fix FBX face materials not being properly loaded if the face count mi…
assimp · Apr 16, 2019 · 36bce5f · 36bce5f
2 parents 5bf096a + 685a562
commit 36bce5f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/code/FBXMeshGeometry.cpp b/code/FBXMeshGeometry.cpp
@@ -630,10 +630,11 @@ void MeshGeometry::ReadVertexDataMaterials(std::vector<int>& materials_out, cons
             materials_out.clear();
         }
 
-        m_materials.assign(m_vertices.size(),materials_out[0]);
+        materials_out.resize(m_vertices.size());
+        std::fill(materials_out.begin(), materials_out.end(), materials_out.at(0));
     }
     else if (MappingInformationType == "ByPolygon" && ReferenceInformationType == "IndexToDirect") {
-        m_materials.resize(face_count);
+        materials_out.resize(face_count);
 
         if(materials_out.size() != face_count) {
             FBXImporter::LogError(Formatter::format("length of input data unexpected for ByPolygon mapping: ")