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

2021-09-29 19:03:57 -07:00
parent a7f6bfbb50 090aa8f053
commit ea3435a9bb
45 changed files with 608 additions and 125 deletions
@@ -9,6 +9,7 @@
 #pragma once

 #include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/std/containers/unordered_set.h>
 #include <AzCore/std/containers/unordered_map.h>
 #include <AzToolsFramework/AssetBrowser/Entries/AssetBrowserEntry.h>

@@ -7,6 +7,7 @@
 */
 #pragma once

+#include <AzCore/std/containers/unordered_set.h>
 #include <AzCore/std/string/string.h>
 #include <AzCore/Asset/AssetCommon.h>
 #include <AzCore/IO/Path/Path.h>
@@ -8,6 +8,7 @@

 #pragma once

+#include <AzCore/Component/EntityId.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Serialization/SerializeContext.h>

@@ -15,7 +15,7 @@
 #include <AzCore/Math/Quaternion.h>
 #include <AzCore/Math/Transform.h>
 #include <AzCore/RTTI/RTTI.h>
-#include <AzCore/std/containers/set.h>
+#include <AzCore/std/containers/unordered_set.h>
 #include <AzCore/std/smart_ptr/enable_shared_from_this.h>
 #include <AzToolsFramework/Manipulators/ManipulatorBus.h>
 #include <AzToolsFramework/Manipulators/ManipulatorSpace.h>
@@ -10,6 +10,7 @@

 #include <AzCore/base.h>
 #include <AzCore/EBus/EBus.h>
+#include <AzCore/std/containers/unordered_set.h>
 #include <AzCore/std/string/string.h>

 namespace AzToolsFramework
@@ -8,6 +8,7 @@

 #pragma once

+#include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiRequestBus.h>

 namespace AzToolsFramework::ViewportUi::Internal