Merge commit '4be1e68bad1b627668a4517b00526bba6cc7acea' into junbo/gitflow_211123_o3de

2021-11-23 13:16:55 -08:00
parent 3a395dd03f 4be1e68bad
commit e2649512b2
1 changed files with 11 additions and 1 deletions
@@ -212,7 +212,17 @@ namespace AzToolsFramework::Prefab

    AZ::EntityId PrefabFocusHandler::GetFocusedPrefabContainerEntityId([[maybe_unused]] AzFramework::EntityContextId entityContextId) const
    {
-        return m_focusedInstanceContainerEntityId;
+        if (m_focusedInstanceContainerEntityId.IsValid())
+        {
+            return m_focusedInstanceContainerEntityId;
+        }
+
+        if (auto instance = GetReferenceFromContainerEntityId(m_focusedInstanceContainerEntityId); instance.has_value())
+        {
+            return instance->get().GetContainerEntityId();
+        }
+
+        return AZ::EntityId();
    }

    bool PrefabFocusHandler::IsOwningPrefabBeingFocused(AZ::EntityId entityId) const