Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/selection

This commit is contained in:
Danilo Aimini
2021-09-23 12:28:31 -07:00
64 changed files with 52 additions and 75 deletions
@@ -83,6 +83,12 @@ namespace AzToolsFramework::Prefab
bool PrefabFocusHandler::IsOwningPrefabBeingFocused(AZ::EntityId entityId)
{
if (!m_focusedInstance.has_value())
{
// PrefabFocusHandler has not been initialized yet.
return false;
}
if (entityId == AZ::EntityId())
{
return false;