Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -103,7 +103,6 @@ namespace AZ
                            pairItor->m_shaderAsset->GetShaderOptionGroupLayout(), pairItor->m_shaderVariantId);
                        if (searchResult.IsRoot())
                        {
-                            AZ_Error(LogName, false, "Searching for a variant should never yield the root variant: %s", shaderVariantTreeAsset.GetHint().c_str());
                            pairItor = newShaderVariantPendingRequests.erase(pairItor);
                            continue;
                        }