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

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> # Conflicts: # Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeTests.cpp # Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp
2021-09-30 10:32:03 -07:00
parent 4d368fe329 3635e5ed35
commit d3bc7d8f12
22 changed files with 673 additions and 277 deletions
@@ -818,7 +818,14 @@ namespace AzToolsFramework
                auto linkIterator = m_linkIdMap.find(linkId);
                if (linkIterator != m_linkIdMap.end())
                {
-                    return AreDirtyTemplatesPresent(linkIterator->second.GetSourceTemplateId());
+                    if (AreDirtyTemplatesPresent(linkIterator->second.GetSourceTemplateId()))
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        continue;
+                    }
                }
            }
            return false;