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
@@ -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());
                    }
                }
            }