Merge branch 'development' into ExposeLodControls

2021-08-20 12:45:00 -07:00
parent b53a085700 aa68122002
commit 2b1f4c2fc0
3092 changed files with 61511 additions and 87536 deletions
@@ -233,7 +233,7 @@ namespace AZ
            {
                EditorMeshStatsForLod stats;
                const auto& meshes = lodAsset->GetMeshes();
-                stats.m_meshCount = meshes.size();
+                stats.m_meshCount = static_cast<AZ::u32>(meshes.size());
                for (const auto& mesh : meshes)
                {
                    stats.m_vertCount += mesh.GetVertexCount();