Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -537,7 +537,7 @@ void CMaterialManager::ReloadDirtyMaterials()

        allMaterials.reserve(mtlCount);

-        uint32 mtlCountPrev = mtlCount;
+        [[maybe_unused]] uint32 mtlCountPrev = mtlCount;
        runtimeMaterialManager->GetLoadedMaterials(&allMaterials, mtlCount);
        AZ_Assert(mtlCountPrev == mtlCount && mtlCount == allMaterials.size(), "It appears GetLoadedMaterials was not used correctly.");