birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into ExposeLodControls

Browse Source
This commit is contained in:
Kyle Birnbaum
2021-08-20 12:45:00 -07:00
committed by GitHub
parent b53a085700 aa68122002
commit 2b1f4c2fc0
3092 changed files with 61511 additions and 87536 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/EditorMeshComponent.cpp
+1 -1
View File
@@ -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();
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.cpp
+2 -2
View File
@@ -95,7 +95,7 @@ namespace AZ
{
if (m_modelAsset.IsReady())
{
lodCount = m_modelAsset->GetLodCount();
lodCount = static_cast<uint32_t>(m_modelAsset->GetLodCount());
}
else
{
@@ -103,7 +103,7 @@ namespace AZ
Data::Instance<RPI::Model> model = Data::InstanceDatabase<RPI::Model>::Instance().Find(Data::InstanceId::CreateFromAssetId(m_modelAsset.GetId()));
if (model)
{
lodCount = model->GetLodCount();
lodCount = static_cast<uint32_t>(model->GetLodCount());
}
}
}