Merge commit '4ee2f341dc0dc709aedb446b57d5cca61b86160d' into junbo/gitflow_211123_o3de

2021-11-23 13:14:59 -08:00
parent 3b39be7fd0 4ee2f341dc
commit 6a40d21b66
14 changed files with 598 additions and 41 deletions
@@ -1599,7 +1599,6 @@ namespace AzToolsFramework
        for (size_t entityIndex = 1; entityIndex < m_selectedEntityIds.size(); ++entityIndex)
        {
            entity = GetSelectedEntityById(m_selectedEntityIds[entityIndex]);
-            AZ_Assert(entity, "Entity id selected for display but no such entity exists");
            if (!entity)
            {
                continue;