Merge branch 'main' into hultonha_LYN-2315_camera-phase-2

Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp

@@ -853,7 +853,7 @@ const char* ScriptSystemComponent::GetGroup() const
 
 const char* AZ::ScriptSystemComponent::GetBrowserIcon() const
 {
-    return "Editor/Icons/Components/LuaScript.svg";
+    return "Icons/Components/LuaScript.svg";
 }
 
 AZ::Uuid AZ::ScriptSystemComponent::GetComponentTypeId() const

Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.cpp

@@ -104,13 +104,12 @@ namespace AZ
         auto serializer = context.GetRegistrationContext()->GetSerializerForType(classData.m_typeId);
         if (serializer)
         {
-            if (storeTypeId == StoreTypeId::Yes)
+            ResultCode result = serializer->Store(node, object, defaultObject, classData.m_typeId, context);
+            if (storeTypeId == StoreTypeId::Yes && result.GetProcessing() != Processing::Halted)
             {
-                return context.Report(Tasks::WriteValue, Outcomes::Catastrophic,
-                    "Unable to store type information in a JSON Serializer primitive.");
+                result.Combine(InsertTypeId(node, classData, context));
             }
-
-            return serializer->Store(node, object, defaultObject, classData.m_typeId, context);
+            return result;
         }
 
         if (classData.m_azRtti && (classData.m_azRtti->GetTypeTraits() & AZ::TypeTraits::is_enum) == AZ::TypeTraits::is_enum)
@@ -128,13 +127,12 @@ namespace AZ
             serializer = context.GetRegistrationContext()->GetSerializerForType(classData.m_azRtti->GetGenericTypeId());
             if (serializer)
             {
-                if (storeTypeId == StoreTypeId::Yes)
+                ResultCode result = serializer->Store(node, object, defaultObject, classData.m_typeId, context);
+                if (storeTypeId == StoreTypeId::Yes && result.GetProcessing() != Processing::Halted)
                 {
-                    return context.Report(Tasks::WriteValue, Outcomes::Catastrophic,
-                        "Unable to store type information in a JSON Serializer primitive.");
+                    result.Combine(InsertTypeId(node, classData, context));
                 }
-
-                return serializer->Store(node, object, defaultObject, classData.m_typeId, context);
+                return result;
             }
         }
         
@@ -149,6 +147,7 @@ namespace AZ
             ResultCode result(Tasks::WriteValue);
             if (storeTypeId == StoreTypeId::Yes)
             {
+                // Not using InsertTypeId here to avoid needing to create the temporary value and swap it in that call.
                 node.AddMember(rapidjson::StringRef(JsonSerialization::TypeIdFieldIdentifier),
                     StoreTypeName(classData, context), context.GetJsonAllocator());
                 result = ResultCode(Tasks::WriteValue, Outcomes::Success);
@@ -569,6 +568,31 @@ namespace AZ
         }
     }
 
+    JsonSerializationResult::ResultCode JsonSerializer::InsertTypeId(
+        rapidjson::Value& output, const SerializeContext::ClassData& classData, JsonSerializerContext& context)
+    {
+        using namespace JsonSerializationResult;
+
+        if (output.IsObject())
+        {
+            rapidjson::Value insertedObject(rapidjson::kObjectType);
+            insertedObject.AddMember(
+                rapidjson::StringRef(JsonSerialization::TypeIdFieldIdentifier), StoreTypeName(classData, context),
+                context.GetJsonAllocator());
+
+            for (auto& element : output.GetObject())
+            {
+                insertedObject.AddMember(AZStd::move(element.name), AZStd::move(element.value), context.GetJsonAllocator());
+            }
+            output = AZStd::move(insertedObject);
+            return ResultCode(Tasks::WriteValue, Outcomes::Success);
+        }
+        else
+        {
+            return context.Report(Tasks::WriteValue, Outcomes::Catastrophic, "Only able to store type information in a JSON Object.");
+        }
+    }
+
     rapidjson::Value JsonSerializer::GetExplicitDefault()
     {
         return rapidjson::Value(rapidjson::kObjectType);

Code/Framework/AzCore/AzCore/Serialization/Json/JsonSerializer.h

@@ -80,6 +80,9 @@ namespace AZ
         static JsonSerializationResult::ResultCode StoreTypeName(rapidjson::Value& output,
             const Uuid& typeId, JsonSerializerContext& context);
 
+        static JsonSerializationResult::ResultCode InsertTypeId(
+            rapidjson::Value& output, const SerializeContext::ClassData& classData, JsonSerializerContext& context);
+
         static rapidjson::Value GetExplicitDefault();
     };
 } // namespace AZ

Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp

@@ -654,7 +654,6 @@ namespace AZ::SettingsRegistryMergeUtils
         if (registry.Get(engineRootPath, FilePathKey_EngineRootFolder))
         {
             AZ::IO::FixedMaxPath mergePath{ AZStd::move(engineRootPath) };
-            mergePath /= "Engine";
             mergePath /= SettingsRegistryInterface::RegistryFolder;
             registry.MergeSettingsFolder(mergePath.Native(), specializations, platform, "", scratchBuffer);
         }

Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializationTests.cpp

@@ -449,6 +449,46 @@ namespace JsonSerializationTests
 
     }
 
+    TEST_F(JsonSerializationTests, Load_PrimitiveForInheritedClass_LoadsCorrectClass)
+    {
+        using namespace AZ::JsonSerializationResult;
+        using namespace ::testing;
+
+        AZStd::string json = AZStd::string::format(R"(
+            {
+                "%s": "SimpleInheritence",
+                "base_var": -88.0,
+                "var1": 88,
+                "var2": 42
+            })",
+            AZ::JsonSerialization::TypeIdFieldIdentifier);
+        m_jsonDocument->Parse(json.c_str());
+
+        SimpleInheritence::Reflect(m_serializeContext, true);
+        m_serializeContext->RegisterGenericType<AZStd::unique_ptr<BaseClass>>();
+        m_jsonRegistrationContext->Serializer<JsonSerializerMock>()->HandlesType<SimpleInheritence>();
+        JsonSerializerMock* mock =
+            reinterpret_cast<JsonSerializerMock*>(m_jsonRegistrationContext->GetSerializerForType(azrtti_typeid<SimpleInheritence>()));
+        EXPECT_CALL(*mock, Load(_, _, _, _))
+            .Times(Exactly(1))
+            .WillRepeatedly(Return(Result(m_deserializationSettings->m_reporting, "Test", Tasks::ReadField, Outcomes::Success, "")));
+
+        AZStd::unique_ptr<BaseClass> instance;
+        ResultCode result = AZ::JsonSerialization::Load(instance, *m_jsonDocument, *m_deserializationSettings);
+        EXPECT_NE(Processing::Halted, result.GetProcessing());
+
+        EXPECT_EQ(azrtti_typeid<SimpleInheritence>(), azrtti_typeid(*instance));
+
+        m_serializeContext->EnableRemoveReflection();
+        SimpleInheritence::Reflect(m_serializeContext, true);
+        m_serializeContext->DisableRemoveReflection();
+
+        m_jsonRegistrationContext->EnableRemoveReflection();
+        m_serializeContext->RegisterGenericType<AZStd::unique_ptr<BaseClass>>();
+        m_jsonRegistrationContext->Serializer<JsonSerializerMock>()->HandlesType<SimpleInheritence>();
+        m_jsonRegistrationContext->DisableRemoveReflection();
+    }
+
     TEST_F(JsonSerializationTests, Store_TemplatedClassWithRegisteredHandler_StoreOnHandlerCalled)
     {
         using namespace AZ::JsonSerializationResult;
@@ -474,6 +514,52 @@ namespace JsonSerializationTests
         m_jsonRegistrationContext->DisableRemoveReflection();
     }
 
+    TEST_F(JsonSerializationTests, Store_PrimitiveForInheritedClass_StoreSucceedsAndTypeIdIsAdded)
+    {
+        using namespace AZ::JsonSerializationResult;
+        using namespace ::testing;
+
+        SimpleInheritence::Reflect(m_serializeContext, true);
+        m_serializeContext->RegisterGenericType<AZStd::unique_ptr<BaseClass>>();
+        m_jsonRegistrationContext->Serializer<JsonSerializerMock>()->HandlesType<SimpleInheritence>();
+        JsonSerializerMock* mock =
+            reinterpret_cast<JsonSerializerMock*>(m_jsonRegistrationContext->GetSerializerForType(azrtti_typeid<SimpleInheritence>()));
+        EXPECT_CALL(*mock, Store(_, _, _, _, _))
+            .Times(Exactly(1))
+            .WillRepeatedly(Invoke([](rapidjson::Value& output, const void*, const void*, const AZ::Uuid&, AZ::JsonSerializerContext& context)
+                {
+                    // Insert some values to allow verification later on.
+                    output.SetObject();
+                    output.AddMember("base_var", -88.0, context.GetJsonAllocator());
+                    output.AddMember("var1", 88, context.GetJsonAllocator());
+                    output.AddMember("var2", 42, context.GetJsonAllocator());
+                    return context.Report(Tasks::WriteValue, Outcomes::Success, "");
+                }));
+
+        AZStd::unique_ptr<BaseClass> instance{ aznew SimpleInheritence() };
+        ResultCode result = AZ::JsonSerialization::Store(*m_jsonDocument, m_jsonDocument->GetAllocator(), instance, *m_serializationSettings);
+        EXPECT_NE(Processing::Halted, result.GetProcessing());
+
+        AZStd::string compare = AZStd::string::format(R"(
+            {
+                "%s": "SimpleInheritence",
+                "base_var": -88.0,
+                "var1": 88,
+                "var2": 42
+            })",
+            AZ::JsonSerialization::TypeIdFieldIdentifier);
+        Expect_DocStrEq(compare.c_str());
+
+        m_serializeContext->EnableRemoveReflection();
+        m_serializeContext->RegisterGenericType<AZStd::unique_ptr<BaseClass>>();
+        SimpleInheritence::Reflect(m_serializeContext, true);
+        m_serializeContext->DisableRemoveReflection();
+
+        m_jsonRegistrationContext->EnableRemoveReflection();
+        m_jsonRegistrationContext->Serializer<JsonSerializerMock>()->HandlesType<SimpleInheritence>();
+        m_jsonRegistrationContext->DisableRemoveReflection();
+    }
+
     TEST_F(JsonSerializationTests, Store_StoreWithNullPtr_ReturnsCatastrophic)
     {
         using namespace AZ::JsonSerializationResult;

Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp

@@ -809,7 +809,7 @@ namespace AzFramework
     #if defined(AZ_ENABLE_TRACING)
                 if (message.m_assetType == AZ::Data::s_invalidAssetType)
                 {
-                    AZ_TracePrintf("AssetCatalog", "Registering asset \"%s\" via AssetSystem message, but type is not set.", relativePath.c_str());
+                    AZ_TracePrintf("AssetCatalog", "Registering asset \"%s\" via AssetSystem message, but type is not set.\n", relativePath.c_str());
                 }
     #endif
 

Code/Framework/AzFramework/AzFramework/FileTag/FileTag.cpp

@@ -12,11 +12,13 @@
 
 #include <AzCore/Serialization/Utils.h>
 #include <AzCore/IO/FileIO.h>
+#include <AzCore/IO/Path/Path.h>
 #include <AzCore/IO/SystemFile.h>
 #include <AzCore/std/algorithm.h>
 #include <AzCore/std/string/wildcard.h>
 #include <AzCore/std/string/regex.h>
 #include <AzCore/std/string/conversions.h>
+#include <AzCore/Utils/Utils.h>
 #include <AzCore/XML/rapidxml.h>
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzFramework/Asset/FileTagAsset.h>
@@ -31,7 +33,7 @@ namespace AzFramework
         const char* ExcludeFileName = "exclude";
         const char* IncludeFileName = "include";
         const char* FileTags[] = { "ignore", "error", "productdependency", "editoronly", "shader" };
-        const char EngineName[] = "Engine";
+        constexpr AZ::IO::PathView EngineAssetSourceRelPath = "Assets/Engine";
 
         void LowerCaseFileTags(AZStd::vector<AZStd::string>& fileTags)
         {
@@ -107,7 +109,7 @@ namespace AzFramework
         }
 
         AZ::Outcome<AZStd::string, AZStd::string> FileTagManager::AddTagsInternal(AZStd::string filePath, FileTagType fileTagType, AZStd::vector<AZStd::string> fileTags, AzFramework::FileTag::FilePatternType filePatternType)
-        {   
+        {
             if (!NormalizeFileAndLowerCaseTags(filePath, filePatternType, fileTags))
             {
                 return AZ::Failure(AZStd::string::format("Unable to normalize file (%s). Unable to remove the file.\n", filePath.c_str()));
@@ -243,11 +245,10 @@ namespace AzFramework
 
         AZStd::string FileTagQueryManager::GetDefaultFileTagFilePath(FileTagType fileTagType)
         {
-            AZStd::string destinationFilePath;
-            const char* engineRoot = nullptr;
-            AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
-            AzFramework::StringFunc::Path::ConstructFull(engineRoot, EngineName, fileTagType == FileTagType::Exclude ? ExcludeFileName : IncludeFileName, AzFramework::FileTag::FileTagAsset::Extension(), destinationFilePath, true);
-            return destinationFilePath;
+            auto destinationFilePath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / EngineAssetSourceRelPath;
+            destinationFilePath /= fileTagType == FileTagType::Exclude ? ExcludeFileName : IncludeFileName;
+            destinationFilePath.ReplaceExtension(AzFramework::FileTag::FileTagAsset::Extension());
+            return destinationFilePath.String();
         }
 
         bool FileTagQueryManager::Load(const AZStd::string& filePath)

Code/Framework/AzFramework/AzFramework/Network/NetBindingComponent.cpp

@@ -44,8 +44,8 @@ namespace AzFramework
                     "Network Binding", "The Network Binding component marks an entity as able to be replicated across the network")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::Category, "Networking")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/NetBinding.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/NetBinding.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NetBinding.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NetBinding.png")
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-network-binding.html")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c));
             }

Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.cpp

@@ -81,7 +81,7 @@ namespace AzFramework
 
     const char* SpawnableAssetHandler::GetBrowserIcon() const
     {
-        return "Editor/Icons/Components/Viewport/EntityInSlice.png";
+        return "Icons/Components/Viewport/EntityInSlice.png";
     }
 
     void SpawnableAssetHandler::GetAssetTypeExtensions(AZStd::vector<AZStd::string>& extensions)

Code/Framework/AzQtComponents/AzQtComponents/Components/StyleManager.cpp

@@ -250,9 +250,9 @@ namespace AzQtComponents
             // STYLESHEETIMAGES:something.txt
             // UI:blah/blah.png
             // EDITOR:blah/something.txt
-            QDir::addSearchPath("STYLESHEETIMAGES", appPath.filePath("Editor/Styles/StyleSheetImages"));
-            QDir::addSearchPath("UI", appPath.filePath("Editor/UI"));
-            QDir::addSearchPath("EDITOR", appPath.filePath("Editor"));
+            QDir::addSearchPath("STYLESHEETIMAGES", appPath.filePath("Assets/Editor/Styles/StyleSheetImages"));
+            QDir::addSearchPath("UI", appPath.filePath("Assets/Editor/UI"));
+            QDir::addSearchPath("EDITOR", appPath.filePath("Assets/Editor"));
         }
     }
 

Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc

@@ -388,8 +388,8 @@
     <file>img/line.png</file>
 </qresource>
 <qresource>
-    <file alias="Editor/Style/EditorStylesheetVariables_Dark.json">../../../../Sandbox/Editor/Style/EditorStylesheetVariables_Dark.json</file>
-    <file alias="Editor/Style/NewEditorStylesheet.qss">../../../../Sandbox/Editor/Style/NewEditorStylesheet.qss</file>
+    <file alias="Assets/Editor/Style/EditorStylesheetVariables_Dark.json">../../../../Sandbox/Editor/Style/EditorStylesheetVariables_Dark.json</file>
+    <file alias="Assets/Editor/Style/NewEditorStylesheet.qss">../../../../Sandbox/Editor/Style/NewEditorStylesheet.qss</file>
 </qresource>
 <qresource prefix="/Cards">
     <file>img/UI20/Cards/point_hand.png</file>

Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp

@@ -216,14 +216,9 @@ namespace AzToolsFramework::AssetUtils
         constexpr const char* AssetProcessorGamePlatformConfigFileName = "AssetProcessorGamePlatformConfig.ini";
         constexpr const char* AssetProcessorGamePlatformConfigSetreg = "AssetProcessorGamePlatformConfig.setreg";
         AZStd::vector<AZ::IO::Path> configFiles;
-        AZ::IO::Path configRoot(engineRoot);
 
-        AZ::IO::Path rootConfigFile = configRoot / AssetProcessorPlatformConfigFileName;
-        configFiles.push_back(rootConfigFile);
-
-        // Add a file entry for the Engine Root AssetProcessor setreg file
-        rootConfigFile = configRoot / AssetProcessorPlatformConfigSetreg;
-        configFiles.push_back(rootConfigFile);
+        // Add the AssetProcessorPlatformConfig setreg file at the engine root
+        configFiles.push_back(AZ::IO::Path(engineRoot) / AssetProcessorPlatformConfigSetreg);
 
         if (addPlatformConfigs)
         {

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp

@@ -200,67 +200,67 @@ namespace AzToolsFramework
             {
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".abc"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/ABC_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/ABC_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".bnk"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/Audio_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/Audio_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".cgf"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/LegacyMesh_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/LegacyMesh_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".font"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/Font_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/Font_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".fontfamily"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/Font_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/Font_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".i_caf"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/LegacyAnimation_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/LegacyAnimation_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".inputbindings"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/InputBindings_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/InputBindings_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".lua"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/Lua_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/Lua_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".mtl"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/Material_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/Material_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), AzToolsFramework::SliceUtilities::GetSliceFileExtension().c_str()))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/Slice_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/Slice_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".skin"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/LegacySkin_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/LegacySkin_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".ttf"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/Font_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/Font_16.svg");
                 }
 
                 if (AzFramework::StringFunc::Equal(extension.c_str(), ".xml"))
                 {
-                    return SourceFileDetails("Editor/Icons/AssetBrowser/XML_16.svg");
+                    return SourceFileDetails("Icons/AssetBrowser/XML_16.svg");
                 }
 
 
@@ -272,7 +272,7 @@ namespace AzToolsFramework
                     const char* sourceFormatExtension = sourceFormats[sourceImageFormatIndex];
                     if (AzFramework::StringFunc::Equal(extension.c_str(), sourceFormatExtension))
                     {
-                        return SourceFileDetails("Editor/Icons/AssetBrowser/Image_16.svg");
+                        return SourceFileDetails("Icons/AssetBrowser/Image_16.svg");
                     }
                 }
             }

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.cpp

@@ -52,17 +52,16 @@ namespace AzToolsFramework
             return AssetEntryType::Root;
         }
 
-        void RootAssetBrowserEntry::Update(const char* devPath)
+        void RootAssetBrowserEntry::Update(const char* enginePath)
         {
             RemoveChildren();
             EntryCache::GetInstance()->Clear();
-            m_scanFolderOutputPrefixMap.clear();
 
-            m_devPath = devPath;
+            m_enginePath = enginePath;
 
             // there is no "Gems" scan folder registered in db, create one manually
             auto gemFolder = aznew FolderAssetBrowserEntry();
-            gemFolder->m_name = m_devPath + AZ_CORRECT_DATABASE_SEPARATOR + GEMS_FOLDER_NAME;
+            gemFolder->m_name = m_enginePath + AZ_CORRECT_DATABASE_SEPARATOR + GEMS_FOLDER_NAME;
             gemFolder->m_displayName = GEMS_FOLDER_NAME;
             gemFolder->m_isGemsFolder = true;
             AddChild(gemFolder);
@@ -90,11 +89,6 @@ namespace AzToolsFramework
                 scanFolder->m_displayName = QString::fromUtf8(scanFolderDatabaseEntry.m_displayName.c_str());
                 EntryCache::GetInstance()->m_scanFolderIdMap[scanFolderDatabaseEntry.m_scanFolderID] = scanFolder;
             }
-
-            if (!scanFolderDatabaseEntry.m_outputPrefix.empty())
-            {
-                m_scanFolderOutputPrefixMap[scanFolderDatabaseEntry.m_scanFolderID] = scanFolderDatabaseEntry.m_outputPrefix;
-            }
         }
 
         void RootAssetBrowserEntry::AddFile(const AssetDatabase::FileDatabaseEntry& fileDatabaseEntry)
@@ -132,7 +126,7 @@ namespace AzToolsFramework
                 return;
             }
 
-            const char* filePath = GetScanFolderOutputAdjustedPath(fileDatabaseEntry, scanFolder);
+            const char* filePath = fileDatabaseEntry.m_fileName.c_str();
 
             AssetBrowserEntry* file;
             // file can be either folder or actual file
@@ -441,33 +435,5 @@ namespace AzToolsFramework
         {
             return MAKE_TKEY(ThumbnailKey);
         }
-
-        const char* RootAssetBrowserEntry::GetScanFolderOutputAdjustedPath(const AssetDatabase::FileDatabaseEntry& fileDatabaseEntry, const AssetBrowserEntry* scanFolder)
-        {
-            Q_UNUSED(scanFolder);
-
-            const char* filePath = fileDatabaseEntry.m_fileName.c_str();
-
-            // adjust for output prefixes on scan folders (i.e. "editor")
-            auto itScanFolderOutputPrefix = m_scanFolderOutputPrefixMap.find(fileDatabaseEntry.m_scanFolderPK);
-            if (itScanFolderOutputPrefix != m_scanFolderOutputPrefixMap.end())
-            {
-                const AZStd::string& outputPrefix = itScanFolderOutputPrefix->second;
-
-                // Check if the input path starts with the output prefix.
-                // If it doesn't, something probably went seriously wrong,
-                // or someone is calling this function with an absolute path.
-                bool pathStartsWithPrefix = ((strncmp(filePath, outputPrefix.c_str(), outputPrefix.length()) == 0) && (fileDatabaseEntry.m_fileName.length() > (outputPrefix.length() + 1)));
-                AZ_Warning("Asset Browser", pathStartsWithPrefix, "Entry %s reported as under a ScanFolder (%s) with an 'output=%s', but the new entry does not begin with the output prefix! RootAssetBrowserEntry::GetScanFolderOutputAdjustedPath expects relative paths, not absolute; treating the input path as if it does not contain the ScanFolder output prefix.", filePath, scanFolder->m_name.c_str(), outputPrefix.c_str());
-
-                if (pathStartsWithPrefix)
-                {
-                    // move the beginning ahead by the output prefix plus the separator
-                    filePath += (outputPrefix.length() + 1);
-                }
-            }
-
-            return filePath;
-        }
     } // namespace AssetBrowser
 } // namespace AzToolsFramework

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Entries/RootAssetBrowserEntry.h

@@ -60,8 +60,8 @@ namespace AzToolsFramework
 
             AssetEntryType GetEntryType() const override;
 
-            //! Update root node to new dev location
-            void Update(const char* devPath);
+            //! Update root node to new engine location
+            void Update(const char* enginePath);
 
             void AddScanFolder(const AssetDatabase::ScanFolderDatabaseEntry& scanFolderDatabaseEntry);
             void AddFile(const AssetDatabase::FileDatabaseEntry& fileDatabaseEntry);
@@ -82,15 +82,12 @@ namespace AzToolsFramework
         private:
             AZ_DISABLE_COPY_MOVE(RootAssetBrowserEntry);
 
-            AZStd::string m_devPath;
-            AZStd::unordered_map<AZ::s64, AZStd::string> m_scanFolderOutputPrefixMap;
+            AZStd::string m_enginePath;
 
             //! Create folder entry child
             FolderAssetBrowserEntry* CreateFolder(const char* folderName, AssetBrowserEntry* parent);
             //! Recursively create folder structure leading to relative path from parent
             AssetBrowserEntry* CreateFolders(const char* relativePath, AssetBrowserEntry* parent);
-            //! Get the path for the fileDatabaseEntry, offset by the output prefix for the scan folder ancestor, if it's been specified and if it's appropriate
-            const char* GetScanFolderOutputAdjustedPath(const AssetDatabase::FileDatabaseEntry& fileDatabaseEntry, const AssetBrowserEntry* scanFolder);
 
             bool m_isInitialUpdate = false;
         };

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/FolderThumbnail.cpp

@@ -50,8 +50,8 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         // FolderThumbnail
         //////////////////////////////////////////////////////////////////////////
-        static constexpr const char* FolderIconPath = "Editor/Icons/AssetBrowser/Folder_16.svg";
-        static constexpr const char* GemIconPath = "Editor/Icons/AssetBrowser/GemFolder_16.svg";
+        static constexpr const char* FolderIconPath = "Icons/AssetBrowser/Folder_16.svg";
+        static constexpr const char* GemIconPath = "Icons/AssetBrowser/GemFolder_16.svg";
 
         FolderThumbnail::FolderThumbnail(SharedThumbnailKey key)
             : Thumbnail(key)

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/ProductThumbnail.cpp

@@ -55,7 +55,7 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         // ProductThumbnail
         //////////////////////////////////////////////////////////////////////////
-        static const char* DEFAULT_PRODUCT_ICON_PATH = "Editor/Icons/AssetBrowser/DefaultProduct_16.svg";
+        static const char* DEFAULT_PRODUCT_ICON_PATH = "Icons/AssetBrowser/DefaultProduct_16.svg";
 
         ProductThumbnail::ProductThumbnail(Thumbnailer::SharedThumbnailKey key)
             : Thumbnail(key)

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Thumbnails/SourceThumbnail.cpp

@@ -55,7 +55,7 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         // SourceThumbnail
         //////////////////////////////////////////////////////////////////////////
-        static constexpr const char* DefaultFileIconPath = "Editor/Icons/AssetBrowser/Default_16.svg";
+        static constexpr const char* DefaultFileIconPath = "Icons/AssetBrowser/Default_16.svg";
         QMutex SourceThumbnail::m_mutex;
 
         SourceThumbnail::SourceThumbnail(SharedThumbnailKey key)

Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.cpp

@@ -943,10 +943,8 @@ namespace AzToolsFramework
             const char* scanFolder,
             const char* displayName,
             const char* portableKey,
-            const char* outputPrefix,
             int isRoot)
             : m_scanFolderID(scanFolderID)
-            , m_outputPrefix(outputPrefix)
             , m_isRoot(isRoot)
         {
             if (scanFolder)
@@ -967,10 +965,8 @@ namespace AzToolsFramework
             const char* scanFolder,
             const char* displayName,
             const char* portableKey,
-            const char* outputPrefix,
             int isRoot)
-            : m_outputPrefix(outputPrefix)
-            , m_isRoot(isRoot)
+            : m_isRoot(isRoot)
         {
             if (scanFolder)
             {
@@ -993,7 +989,6 @@ namespace AzToolsFramework
             , m_scanFolder(other.m_scanFolder)
             , m_displayName(other.m_displayName)
             , m_portableKey(other.m_portableKey)
-            , m_outputPrefix(other.m_outputPrefix)
             , m_isRoot(other.m_isRoot)
         {
         }
@@ -1011,7 +1006,6 @@ namespace AzToolsFramework
                 m_scanFolderID = other.m_scanFolderID;
                 m_displayName = AZStd::move(other.m_displayName);
                 m_portableKey = AZStd::move(other.m_portableKey);
-                m_outputPrefix = AZStd::move(other.m_outputPrefix);
                 m_isRoot = other.m_isRoot;
             }
             return *this;
@@ -1023,7 +1017,6 @@ namespace AzToolsFramework
             m_scanFolderID = other.m_scanFolderID;
             m_displayName = other.m_displayName;
             m_portableKey = other.m_portableKey;
-            m_outputPrefix = other.m_outputPrefix;
             m_isRoot = other.m_isRoot;
             return *this;
         }
@@ -1050,7 +1043,6 @@ namespace AzToolsFramework
                 MakeColumn("ScanFolder", m_scanFolder),
                 MakeColumn("DisplayName", m_displayName),
                 MakeColumn("PortableKey", m_portableKey),
-                MakeColumn("OutputPrefix", m_outputPrefix),
                 MakeColumn("IsRoot", m_isRoot)
             );
         }

Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.h

@@ -68,6 +68,7 @@ namespace AzToolsFramework
             AddedLastScanTimeField = 28,
             AddedScanTimeSecondsSinceEpochField = 29,
             ChangedSortFunctionFromQSortToStdStableSort = 30,
+            RemoveOutputPrefixFromScanFolders,
             //Add all new versions before this
             DatabaseVersionCount,
             LatestVersion = DatabaseVersionCount - 1
@@ -99,12 +100,10 @@ namespace AzToolsFramework
                 const char* scanFolder,
                 const char* displayName,
                 const char* portableKey,
-                const char* outputPrefix,
                 int isRoot = 0);
             ScanFolderDatabaseEntry(const char* scanFolder,
                 const char* displayName,
                 const char* portableKey,
-                const char* outputPrefix,
                 int isRoot = 0);
             ScanFolderDatabaseEntry(const ScanFolderDatabaseEntry& other);
             ScanFolderDatabaseEntry(ScanFolderDatabaseEntry&& other);
@@ -120,7 +119,6 @@ namespace AzToolsFramework
             AZStd::string m_scanFolder; // the actual local computer path to that scan folder.
             AZStd::string m_displayName; // a display name, blank means it should not show up in UIs
             AZStd::string m_portableKey; // a key that uniquely identifies a scan folder so that we can recognize the same one in other databases/computer
-            AZStd::string m_outputPrefix;
             int m_isRoot = 0;
         };
 

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp

@@ -108,11 +108,9 @@ namespace AzToolsFramework
             m_targetTemplateId = id;
         }
 
-        void Link::SetTemplatePatches(const PrefabDomValue& patches)
+        void Link::SetLinkDom(const PrefabDomValue& linkDom)
         {
-            PrefabDom newPatches;
-            newPatches.CopyFrom(patches, newPatches.GetAllocator());
-            m_linkDom.Swap(newPatches);
+            m_linkDom.CopyFrom(linkDom, m_linkDom.GetAllocator());
         }
 
         void Link::SetInstanceName(const char* instanceName)

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.h

@@ -47,7 +47,7 @@ namespace AzToolsFramework
 
             void SetSourceTemplateId(TemplateId id);
             void SetTargetTemplateId(TemplateId id);
-            void SetTemplatePatches(const PrefabDomValue& patches);
+            void SetLinkDom(const PrefabDomValue& linkDom);
             void SetInstanceName(const char* instanceName);
 
             bool IsValid() const;

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp

@@ -782,22 +782,21 @@ namespace AzToolsFramework
             link.SetInstanceName(instanceName.data());
 
             PrefabDomValue& instance = instanceIterator->value;
+            AZ_Assert(instance.IsObject(), "Nested instance DOM provided is not a valid JSON object.");
+            PrefabDomValueReference sourceTemplateName = PrefabDomUtils::FindPrefabDomValue(instance, PrefabDomUtils::SourceName);
+            AZ_Assert(sourceTemplateName, "Couldn't find source template name in the DOM of the nested instance while creating a link.");
+            AZ_Assert(
+                sourceTemplateName->get() == sourceTemplate.GetFilePath().c_str(),
+                "The name of the source template in the nested instance DOM does not match the name of the source template already loaded");
 
             PrefabDomValueReference patchesReference = PrefabDomUtils::FindPrefabDomValue(instance, PrefabDomUtils::PatchesName);
-            if (!patchesReference.has_value())
+            if (patchesReference.has_value())
             {
-                PrefabDom& newLinkDom = link.GetLinkDom();
-
-                newLinkDom.SetObject();
-
-                newLinkDom.AddMember(rapidjson::StringRef(PrefabDomUtils::SourceName),
-                    rapidjson::StringRef(sourceTemplate.GetFilePath().c_str()), newLinkDom.GetAllocator());
-            }
-            else
-            {
-                link.SetTemplatePatches(patchesReference->get());
+                AZ_Assert(patchesReference->get().IsArray(), "Patches in the nested instance DOM are not represented as an array.");
             }
 
+            link.SetLinkDom(instance);
+
             if (!link.UpdateTarget())
             {
                 AZ_Error("Prefab", false,

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/LoadingThumbnail.cpp

@@ -23,7 +23,7 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         // LoadingThumbnail
         //////////////////////////////////////////////////////////////////////////
-        static const char* LoadingIconPath = "Editor/Icons/AssetBrowser/in_progress.gif";
+        static const char* LoadingIconPath = "Icons/AssetBrowser/in_progress.gif";
 
         LoadingThumbnail::LoadingThumbnail()
             : Thumbnail(MAKE_TKEY(ThumbnailKey))

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/MissingThumbnail.cpp

@@ -16,7 +16,7 @@ namespace AzToolsFramework
 {
     namespace Thumbnailer
     {
-        static const char* MISSING_ICON_PATH = "Editor/Icons/AssetBrowser/Default_16.svg";
+        static const char* MISSING_ICON_PATH = "Icons/AssetBrowser/Default_16.svg";
 
         MissingThumbnail::MissingThumbnail()
             : Thumbnail(MAKE_TKEY(ThumbnailKey))

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/SourceControlThumbnail.cpp

@@ -64,8 +64,8 @@ namespace AzToolsFramework
         //////////////////////////////////////////////////////////////////////////
         // SourceControlThumbnail
         //////////////////////////////////////////////////////////////////////////
-        static const char* WRITABLE_ICON_PATH = "Editor/Icons/AssetBrowser/Writable_16.svg";
-        static const char* NONWRITABLE_ICON_PATH = "Editor/Icons/AssetBrowser/NonWritable_16.svg";
+        static const char* WRITABLE_ICON_PATH = "Icons/AssetBrowser/Writable_16.svg";
+        static const char* NONWRITABLE_ICON_PATH = "Icons/AssetBrowser/NonWritable_16.svg";
 
         bool SourceControlThumbnail::m_readyForUpdate = true;
 

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.cpp

@@ -101,8 +101,8 @@ namespace AzToolsFramework
                 {
                     editContext->Class<EditorLayerComponent>("Layer", "The layer component allows entities to be saved to different files on disk.")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Layers.svg")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Layers.svg")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Layers.svg")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Layers.svg")
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Layer", 0xe4db211a))
                         ->Attribute(AZ::Edit::Attributes::AddableByUser, false)
                         ->Attribute(AZ::Edit::Attributes::RemoveableByUser, false)

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp

@@ -1025,9 +1025,9 @@ namespace AzToolsFramework
                         ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &ScriptEditorComponent::m_customName)
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::Category, "Scripting")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/LuaScript.svg")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/LuaScript.svg")
                         ->Attribute(AZ::Edit::Attributes::PrimaryAssetType, AZ::AzTypeInfo<AZ::ScriptAsset>::Uuid())
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Script.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Script.png")
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-lua-script.html")
                         ->DataElement("AssetRef", &ScriptEditorComponent::m_scriptAsset, "Script", "Which script to use")
                             ->Attribute(AZ::Edit::Attributes::ChangeNotify, &ScriptEditorComponent::ScriptHasChanged)

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp

@@ -1224,8 +1224,8 @@ namespace AzToolsFramework
                 {
                     ptrEdit->Class<TransformComponent>("Transform", "Controls the placement of the entity in the world in 3d")->
                         ClassElement(AZ::Edit::ClassElements::EditorData, "")->
-                            Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Transform.svg")->
-                            Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Transform.png")->
+                            Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Transform.svg")->
+                            Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Transform.png")->
                             Attribute(AZ::Edit::Attributes::AutoExpand, true)->
                         DataElement(AZ::Edit::UIHandlers::Default, &TransformComponent::m_parentEntityId, "Parent entity", "")->
                             Attribute(AZ::Edit::Attributes::ChangeValidate, &TransformComponent::ValidatePotentialParent)->

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp

@@ -544,7 +544,7 @@ namespace AzToolsFramework
             m_errorButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
             m_errorButton->setFixedSize(QSize(16, 16));
             m_errorButton->setMouseTracking(true);
-            m_errorButton->setIcon(QIcon("Editor/Icons/PropertyEditor/error_icon.png"));
+            m_errorButton->setIcon(QIcon("Icons/PropertyEditor/error_icon.png"));
             m_errorButton->setToolTip("Show Errors");
 
             // Insert the error button after the asset label
@@ -1304,7 +1304,11 @@ namespace AzToolsFramework
         }
         else if (attrib == AZ_CRC_CE("Thumbnail"))
         {
-            GUI->SetShowThumbnail(true);
+            bool showThumbnail = false;
+            if (attrValue->Read<bool>(showThumbnail))
+            {
+                GUI->SetShowThumbnail(showThumbnail);
+            }
         }
         else if (attrib == AZ_CRC_CE("ThumbnailCallback"))
         {

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp

@@ -114,6 +114,7 @@ namespace AzToolsFramework
             m_thumbnailEnlarged->move(position);
             m_thumbnailEnlarged->setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
             m_thumbnailEnlarged->SetThumbnailKey(m_key);
+            m_thumbnailEnlarged->raise();
             m_thumbnailEnlarged->show();
         }
         QWidget::enterEvent(e);

Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.cpp

@@ -70,7 +70,7 @@ namespace AzToolsFramework
         m_tagLabel->setMinimumSize(24, 22);
         m_tagLabel->setAttribute(Qt::WA_TransparentForMouseEvents, true);
 
-        QIcon closeIcon("Editor/Icons/animation/close.png");
+        QIcon closeIcon("Icons/animation/close.png");
 
         QPushButton* button = new QPushButton(this);
         button->setStyleSheet(button->styleSheet() + "border: 0px;");
@@ -233,14 +233,14 @@ namespace AzToolsFramework
         QPushButton* loadButton = new QPushButton(this);
         loadButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
         loadButton->setFixedSize(QSize(24, 24));
-        loadButton->setIcon(QIcon("Editor/UI/Icons/toolbar/libraryLoad.png"));
+        loadButton->setIcon(QIcon("UI/Icons/toolbar/libraryLoad.png"));
         loadButton->setToolTip(tr("Load a saved filter"));
         loadButton->setProperty("iconButton", "true");
 
         m_saveButton = new QPushButton(this);
         m_saveButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
         m_saveButton->setFixedSize(QSize(24, 24));
-        m_saveButton->setIcon(QIcon("Editor/UI/Icons/toolbar/librarySave.png"));
+        m_saveButton->setIcon(QIcon("UI/Icons/toolbar/librarySave.png"));
         m_saveButton->setToolTip(tr("Save the current filter"));
         m_saveButton->setEnabled(false);
         m_saveButton->setProperty("iconButton", "true");
@@ -248,7 +248,7 @@ namespace AzToolsFramework
         m_toggleAllFiltersButton = new QPushButton(this);
         m_toggleAllFiltersButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
         m_toggleAllFiltersButton->setFixedSize(QSize(24, 24));
-        m_toggleAllFiltersButton->setIcon(QIcon("Editor/Icons/animation/filter_16.png"));
+        m_toggleAllFiltersButton->setIcon(QIcon("Icons/animation/filter_16.png"));
         m_toggleAllFiltersButton->setVisible(false);
         m_toggleAllFiltersButton->setToolTip(tr("Toggle all filters on/off"));
         m_toggleAllFiltersButton->setProperty("iconButton", "true");
@@ -267,7 +267,7 @@ namespace AzToolsFramework
         m_clearAllButton = new QPushButton(this);
         m_clearAllButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
         m_clearAllButton->setFixedSize(QSize(24, 24));
-        m_clearAllButton->setIcon(QIcon("Editor/Icons/animation/close.png"));
+        m_clearAllButton->setIcon(QIcon("Icons/animation/close.png"));
         m_clearAllButton->setVisible(false);
         m_clearAllButton->setToolTip(tr("Clear all filters"));
         m_clearAllButton->setProperty("iconButton", "true");

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp

@@ -441,7 +441,7 @@ namespace AzToolsFramework
             clusterId);
     }
 
-    static void SetViewportUiClusterVisible(ViewportUi::ClusterId clusterId, bool visible)
+    static void SetViewportUiClusterVisible(const ViewportUi::ClusterId clusterId, const bool visible)
     {
         ViewportUi::ViewportUiRequestBus::Event(
             ViewportUi::DefaultViewportId,
@@ -449,7 +449,7 @@ namespace AzToolsFramework
             clusterId, visible);
     }
 
-    static void SetViewportUiClusterActiveButton(ViewportUi::ClusterId clusterId, ViewportUi::ButtonId buttonId)
+    static void SetViewportUiClusterActiveButton(const ViewportUi::ClusterId clusterId, const ViewportUi::ButtonId buttonId)
     {
         ViewportUi::ViewportUiRequestBus::Event(
             ViewportUi::DefaultViewportId,
@@ -457,7 +457,7 @@ namespace AzToolsFramework
             clusterId, buttonId);
     }
 
-    static ViewportUi::ButtonId RegisterClusterButton(ViewportUi::ClusterId clusterId, const char* iconName)
+    static ViewportUi::ButtonId RegisterClusterButton(const ViewportUi::ClusterId clusterId, const char* iconName)
     {
         ViewportUi::ButtonId buttonId;
         ViewportUi::ViewportUiRequestBus::EventResult(

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp

@@ -13,7 +13,6 @@
 #include "AzToolsFramework_precompiled.h"
 
 #include <AzToolsFramework/ViewportUi/Button.h>
-#include <AzToolsFramework/ViewportUi/Cluster.h>
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
@@ -22,4 +21,11 @@ namespace AzToolsFramework::ViewportUi::Internal
         , m_buttonId(buttonId)
     {
     }
+
+    Button::Button(AZStd::string icon, AZStd::string name, ButtonId buttonId)
+        : m_icon(AZStd::move(icon))
+        , m_name(AZStd::move(name))
+        , m_buttonId(buttonId)
+    {
+    }
 } // namespace AzToolsFramework::ViewportUi::Internal

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.h

@@ -12,7 +12,6 @@
 
 #pragma once
 
-#include <AzToolsFramework/ViewportUi/Cluster.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiRequestBus.h>
 
 namespace AzToolsFramework::ViewportUi::Internal
@@ -27,10 +26,12 @@ namespace AzToolsFramework::ViewportUi::Internal
             Deselected
         };
 
-        explicit Button(AZStd::string icon, ButtonId buttonId);
+        Button(AZStd::string icon, ButtonId buttonId);
+        Button(AZStd::string icon, AZStd::string name, ButtonId buttonId);
         ~Button() = default;
 
         AZStd::string m_icon; //!< The icon for this button, string path to an image.
+        AZStd::string m_name; //!< The name displayed as a label next to the button's icon.
         State m_state = State::Deselected; 
         ButtonId m_buttonId; 
     };

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.cpp

@@ -11,37 +11,27 @@
 */
 
 #include <AzToolsFramework/ViewportUi/Button.h>
-#include <AzToolsFramework/ViewportUi/Cluster.h>
+#include <AzToolsFramework/ViewportUi/ButtonGroup.h>
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
-    Cluster::Cluster()
+    ButtonGroup::ButtonGroup()
         : m_buttons()
         , m_buttonTriggeredEvent()
     {
     }
 
-    void Cluster::SetViewportUiElementId(const ViewportUiElementId id)
+    void ButtonGroup::SetViewportUiElementId(const ViewportUiElementId id)
     {
         m_viewportUiId = id;
     }
 
-    ViewportUiElementId Cluster::GetViewportUiElementId() const
+    ViewportUiElementId ButtonGroup::GetViewportUiElementId() const
     {
         return m_viewportUiId;
     }
 
-    void Cluster::SetClusterId(const ClusterId clusterId)
-    {
-        m_clusterId = clusterId;
-    }
-
-    ClusterId Cluster::GetClusterId() const
-    {
-        return m_clusterId;
-    }
-
-    void Cluster::SetHighlightedButton(ButtonId buttonId)
+    void ButtonGroup::SetHighlightedButton(ButtonId buttonId)
     {
         if (auto buttonEntry = m_buttons.find(buttonId); buttonEntry != m_buttons.end())
         {
@@ -53,15 +43,22 @@ namespace AzToolsFramework::ViewportUi::Internal
         }
     }
 
-    ButtonId Cluster::AddButton(const AZStd::string& icon)
+    ButtonId ButtonGroup::AddButton(const AZStd::string& icon, const AZStd::string& name)
     {
         auto buttonId = ButtonId(m_buttons.size() + 1);
 
-        m_buttons.insert({buttonId, AZStd::make_unique<Button>(icon, buttonId)});
+        if (name.empty())
+        {
+            m_buttons.insert({buttonId, AZStd::make_unique<Button>(icon, buttonId)});
+        }
+        else
+        {
+            m_buttons.insert({buttonId, AZStd::make_unique<Button>(icon, name, buttonId)});
+        }
         return buttonId;
     }
 
-    Button* Cluster::GetButton(ButtonId buttonId)
+    Button* ButtonGroup::GetButton(ButtonId buttonId)
     {
         if (auto buttonEntry = m_buttons.find(buttonId); buttonEntry != m_buttons.end())
         {
@@ -70,7 +67,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         return nullptr;
     }
 
-    AZStd::vector<Button*> Cluster::GetButtons()
+    AZStd::vector<Button*> ButtonGroup::GetButtons()
     {
         auto buttons = AZStd::vector<Button*>();
         for (const auto& button : m_buttons)
@@ -80,11 +77,11 @@ namespace AzToolsFramework::ViewportUi::Internal
         return buttons;
     }
 
-    void Cluster::ConnectEventHandler(AZ::Event<ButtonId>::Handler& handler) {
+    void ButtonGroup::ConnectEventHandler(AZ::Event<ButtonId>::Handler& handler) {
         handler.Connect(m_buttonTriggeredEvent);
     }
 
-    void Cluster::PressButton(ButtonId buttonId)
+    void ButtonGroup::PressButton(ButtonId buttonId)
     {
         m_buttonTriggeredEvent.Signal(buttonId);
     }

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ButtonGroup.h

@@ -18,23 +18,21 @@ namespace AzToolsFramework::ViewportUi::Internal
 {
     class Button;
 
-    //! Data class for a cluster on the Viewport UI. A cluster is defined as a group of buttons with icons
+    //! Data class for a button group on the Viewport UI. A button group is defined as a group of buttons with icons
     //! each of which can be clicked to trigger an event e.g. toggling between modes.
-    class Cluster
+    //! @note This can be used with either a Cluster or a Switcher with slightly different visuals for each.
+    class ButtonGroup
     {
     public:
-        Cluster();
-        ~Cluster() = default;
+        ButtonGroup();
+        ~ButtonGroup() = default;
 
         void SetHighlightedButton(ButtonId buttonId);
 
         void SetViewportUiElementId(ViewportUiElementId id);
         ViewportUiElementId GetViewportUiElementId() const;
 
-        void SetClusterId(ClusterId id);
-        ClusterId GetClusterId() const;
-
-        ButtonId AddButton(const AZStd::string& icon);
+        ButtonId AddButton(const AZStd::string& icon, const AZStd::string& name = AZStd::string());
         Button* GetButton(ButtonId buttonId);
         AZStd::vector<Button*> GetButtons();
 
@@ -44,7 +42,6 @@ namespace AzToolsFramework::ViewportUi::Internal
     private:
         AZ::Event<ButtonId> m_buttonTriggeredEvent;
         ViewportUiElementId m_viewportUiId;
-        ClusterId m_clusterId;
         AZStd::unordered_map<ButtonId, AZStd::unique_ptr<Button>> m_buttons;
     };
 } // namespace AzToolsFramework::ViewportUi::Internal

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp

@@ -9,21 +9,22 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 */
+
 #include "AzToolsFramework_precompiled.h"
 
-#include <AzToolsFramework/ViewportUi/Cluster.h>
+#include <AzToolsFramework/ViewportUi/ButtonGroup.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiCluster.h>
 
 namespace AzToolsFramework::ViewportUi::Internal
 {
-    ViewportUiCluster::ViewportUiCluster(AZStd::shared_ptr<Cluster> cluster)
+    ViewportUiCluster::ViewportUiCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup)
         : QToolBar(nullptr)
-        , m_cluster(cluster)
+        , m_buttonGroup(buttonGroup)
     {
         setOrientation(Qt::Orientation::Vertical);
         setStyleSheet("background: black;");
 
-        const AZStd::vector<Button*> buttons = cluster->GetButtons();
+        const AZStd::vector<Button*> buttons = buttonGroup->GetButtons();
         for (auto button : buttons)
         {
             RegisterButton(button);
@@ -39,7 +40,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         AddClusterAction(
             action,
             [this, button]() {
-                m_cluster->PressButton(button->m_buttonId);
+                m_buttonGroup->PressButton(button->m_buttonId);
             },
             [button](QAction* action) {
                 action->setChecked(button->m_state == Button::State::Selected);

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.h

@@ -18,10 +18,10 @@
 #include <AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h>
 #include <QToolBar>
 
-class Cluster;
-
 namespace AzToolsFramework::ViewportUi::Internal
 {
+    class ButtonGroup;
+
     //! Helper class to make clusters (toolbars) for display in Viewport UI.
     class ViewportUiCluster
         : public QToolBar
@@ -29,7 +29,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         Q_OBJECT
 
     public:
-        ViewportUiCluster(AZStd::shared_ptr<Cluster> cluster);
+        ViewportUiCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup);
         ~ViewportUiCluster() = default;
 
         //! Adds a new button to the cluster.
@@ -49,7 +49,7 @@ namespace AzToolsFramework::ViewportUi::Internal
         //! Removes an action from the Viewport UI Cluster.
         void RemoveClusterAction(QAction* action);
 
-        AZStd::shared_ptr<Cluster> m_cluster; //!< Data structure which the cluster will be displaying to the Viewport UI.
+        AZStd::shared_ptr<ButtonGroup> m_buttonGroup; //!< Data structure which the cluster will be displaying to the Viewport UI.
         AZStd::unordered_map<ButtonId, QPointer<QAction>> m_buttonActionMap; //!< Map for buttons to their corresponding actions.
         ViewportUiWidgetCallbacks m_widgetCallbacks; //!< Registers actions and manages updates.
     };

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp

@@ -18,6 +18,7 @@
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiDisplay.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiCluster.h>
+#include <AzToolsFramework/ViewportUi/ViewportUiSwitcher.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiTextField.h>
 #include <QWidget>
 
@@ -55,16 +56,16 @@ namespace AzToolsFramework::ViewportUi::Internal
         UnparentWidgets(m_viewportUiElements);
     }
 
-    void ViewportUiDisplay::AddCluster(AZStd::shared_ptr<Cluster> cluster)
+    void ViewportUiDisplay::AddCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup)
     {
-        if (!cluster.get())
+        if (!buttonGroup.get())
         {
             return;
         }
 
-        auto viewportUiCluster = AZStd::make_shared<ViewportUiCluster>(cluster);
+        auto viewportUiCluster = AZStd::make_shared<ViewportUiCluster>(buttonGroup);
         auto id = AddViewportUiElement(viewportUiCluster);
-        cluster->SetViewportUiElementId(id);
+        buttonGroup->SetViewportUiElementId(id);
         PositionViewportUiElementAnchored(id, Qt::AlignTop | Qt::AlignLeft);
     }
 
@@ -93,6 +94,51 @@ namespace AzToolsFramework::ViewportUi::Internal
         }
     }
 
+    void ViewportUiDisplay::AddSwitcher(AZStd::shared_ptr<ButtonGroup> buttonGroup)
+    {
+        if (!buttonGroup.get())
+        {
+            return;
+        }
+
+        auto viewportUiSwitcher = AZStd::make_shared<ViewportUiSwitcher>(buttonGroup);
+        auto id = AddViewportUiElement(viewportUiSwitcher);
+        buttonGroup->SetViewportUiElementId(id);
+        PositionViewportUiElementAnchored(id, Qt::AlignTop | Qt::AlignLeft);
+    }
+
+    void ViewportUiDisplay::AddSwitcherButton(const ViewportUiElementId clusterId, Button* button)
+    {
+        if (auto viewportUiSwitcher = qobject_cast<ViewportUiSwitcher*>(GetViewportUiElement(clusterId).get()))
+        {
+            viewportUiSwitcher->AddButton(button);
+        }
+    }
+
+    void ViewportUiDisplay::RemoveSwitcherButton(ViewportUiElementId clusterId, ButtonId buttonId)
+    {
+        if (auto cluster = qobject_cast<ViewportUiSwitcher*>(GetViewportUiElement(clusterId).get()))
+        {
+            cluster->RemoveButton(buttonId);
+        }
+    }
+
+    void ViewportUiDisplay::UpdateSwitcher(ViewportUiElementId clusterId)
+    {
+        if (auto cluster = qobject_cast<ViewportUiSwitcher*>(GetViewportUiElement(clusterId).get()))
+        {
+            cluster->Update();
+        }
+    }
+
+    void ViewportUiDisplay::SetSwitcherActiveButton(ViewportUiElementId clusterId, ButtonId buttonId)
+    {
+        if (auto viewportUiSwitcher = qobject_cast<ViewportUiSwitcher*>(GetViewportUiElement(clusterId).get()))
+        {
+            viewportUiSwitcher->SetActiveButton(buttonId);
+        }
+    }
+
     void ViewportUiDisplay::AddTextField(AZStd::shared_ptr<TextField> textField)
     {
         if (!textField.get())

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h

@@ -13,7 +13,7 @@
 #pragma once
 
 #include <AzToolsFramework/ViewportUi/Button.h>
-#include <AzToolsFramework/ViewportUi/Cluster.h>
+#include <AzToolsFramework/ViewportUi/ButtonGroup.h>
 #include <AzToolsFramework/ViewportUi/TextField.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiRequestBus.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.h>
@@ -56,11 +56,17 @@ namespace AzToolsFramework::ViewportUi::Internal
         ViewportUiDisplay(QWidget* parent, QWidget* renderOverlay);
         ~ViewportUiDisplay();
 
-        void AddCluster(AZStd::shared_ptr<Cluster> cluster);
+        void AddCluster(AZStd::shared_ptr<ButtonGroup> buttonGroup);
         void AddClusterButton(ViewportUiElementId clusterId, Button* button);
         void RemoveClusterButton(ViewportUiElementId clusterId, ButtonId buttonId);
         void UpdateCluster(const ViewportUiElementId clusterId);
 
+        void AddSwitcher(AZStd::shared_ptr<ButtonGroup> buttonGroup);
+        void AddSwitcherButton(ViewportUiElementId switcherId, Button* button);
+        void RemoveSwitcherButton(ViewportUiElementId switcherId, ButtonId buttonId);
+        void UpdateSwitcher(ViewportUiElementId switcherId);
+        void SetSwitcherActiveButton(ViewportUiElementId switcherId, ButtonId buttonId);
+
         void AddTextField(AZStd::shared_ptr<TextField> textField);
         void UpdateTextField(ViewportUiElementId textFieldId);
 

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp

@@ -30,7 +30,7 @@ namespace AzToolsFramework::ViewportUi::Internal
 
         // create a 3x2 map of sub layouts which will stack widgets according to their mapped alignment
         m_internalLayouts = AZStd::unordered_map<Qt::Alignment, QBoxLayout*> {
-            CreateSubLayout(new QHBoxLayout(), 0, 0, Qt::AlignTop | Qt::AlignLeft),
+            CreateSubLayout(new QVBoxLayout(), 0, 0, Qt::AlignTop | Qt::AlignLeft),
             CreateSubLayout(new QHBoxLayout(), 1, 0, Qt::AlignBottom | Qt::AlignLeft),
             CreateSubLayout(new QVBoxLayout(), 0, 1, Qt::AlignTop),
             CreateSubLayout(new QHBoxLayout(), 1, 1, Qt::AlignBottom),
@@ -60,7 +60,7 @@ namespace AzToolsFramework::ViewportUi::Internal
     AZStd::pair<Qt::Alignment, QBoxLayout*> ViewportUiDisplayLayout::CreateSubLayout(
         QBoxLayout* layout, const int row, const int column, const Qt::Alignment alignment)
     {
-        layout->setAlignment(alignment); 
+        layout->setAlignment(alignment);
 
         // add an invisible spacer (stretch) to occupy empty space
         // without this, alignment and resizing within the sublayouts becomes difficult

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp

@@ -14,7 +14,7 @@
 
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzToolsFramework/ViewportUi/Button.h>
-#include <AzToolsFramework/ViewportUi/Cluster.h>
+#include <AzToolsFramework/ViewportUi/ButtonGroup.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiManager.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiDisplay.h>
 
@@ -32,36 +32,64 @@ namespace AzToolsFramework::ViewportUi
 
     const ClusterId ViewportUiManager::CreateCluster()
     {
-        auto cluster = AZStd::make_shared<Internal::Cluster>();
-        m_viewportUi->AddCluster(cluster);
+        auto buttonGroup = AZStd::make_shared<Internal::ButtonGroup>();
+        m_viewportUi->AddCluster(buttonGroup);
 
-        return RegisterNewCluster(cluster);
+        return RegisterNewCluster(buttonGroup);
+    }
+
+    const SwitcherId ViewportUiManager::CreateSwitcher()
+    {
+        auto buttonGroup = AZStd::make_shared<Internal::ButtonGroup>();
+        m_viewportUi->AddSwitcher(buttonGroup);
+
+        return RegisterNewSwitcher(buttonGroup);
     }
 
     void ViewportUiManager::SetClusterActiveButton(const ClusterId clusterId, const ButtonId buttonId)
     {
-        if (auto clusterEntry = m_clusters.find(clusterId); clusterEntry != m_clusters.end())
+        if (auto clusterIt = m_clusterButtonGroups.find(clusterId); clusterIt != m_clusterButtonGroups.end())
         {
-            auto cluster = clusterEntry->second;
+            auto cluster = clusterIt->second;
             cluster->SetHighlightedButton(buttonId);
-            UpdateClusterUi(cluster.get());
+            UpdateButtonGroupUi(cluster.get());
+        }
+    }
+
+    void ViewportUiManager::SetSwitcherActiveButton(const SwitcherId switcherId, const ButtonId buttonId)
+    {
+        if (auto switcherIt = m_switcherButtonGroups.find(switcherId); switcherIt != m_switcherButtonGroups.end())
+        {
+            auto switcher = switcherIt->second;
+            switcher->SetHighlightedButton(buttonId);
+            m_viewportUi->SetSwitcherActiveButton(switcher->GetViewportUiElementId(), buttonId);
+            UpdateButtonGroupUi(switcher.get());
         }
     }
 
     void ViewportUiManager::RegisterClusterEventHandler(const ClusterId clusterId, AZ::Event<ButtonId>::Handler& handler)
     {
-        if (auto clusterEntry = m_clusters.find(clusterId); clusterEntry != m_clusters.end())
+        if (auto clusterIt = m_clusterButtonGroups.find(clusterId); clusterIt != m_clusterButtonGroups.end())
         {
-            auto cluster = clusterEntry->second;
+            auto cluster = clusterIt->second;
             cluster->ConnectEventHandler(handler);
         }
     }
 
+    void ViewportUiManager::RegisterSwitcherEventHandler(const SwitcherId switcherId, AZ::Event<ButtonId>::Handler& handler)
+    {
+        if (auto switcherIt = m_switcherButtonGroups.find(switcherId); switcherIt != m_switcherButtonGroups.end())
+        {
+            auto switcher = switcherIt->second;
+            switcher->ConnectEventHandler(handler);
+        }
+    }
+
     const ButtonId ViewportUiManager::CreateClusterButton(const ClusterId clusterId, const AZStd::string& icon)
     {
-        if (auto clusterEntry = m_clusters.find(clusterId); clusterEntry != m_clusters.end())
+        if (auto clusterIt = m_clusterButtonGroups.find(clusterId); clusterIt != m_clusterButtonGroups.end())
         {
-            auto cluster = clusterEntry->second;
+            auto cluster = clusterIt->second;
             auto newId = cluster->AddButton(icon);
             m_viewportUi->AddClusterButton(cluster->GetViewportUiElementId(), cluster->GetButton(newId));
 
@@ -71,12 +99,35 @@ namespace AzToolsFramework::ViewportUi
         return ButtonId(0);
     }
 
+    const ButtonId ViewportUiManager::CreateSwitcherButton(const SwitcherId switcherId, const AZStd::string& icon, const AZStd::string& name)
+    {
+        if (auto switcherIt = m_switcherButtonGroups.find(switcherId); switcherIt != m_switcherButtonGroups.end())
+        {
+            auto switcher = switcherIt->second;
+            auto newId = switcher->AddButton(icon, name);
+            m_viewportUi->AddSwitcherButton(switcher->GetViewportUiElementId(), switcher->GetButton(newId));
+
+            return newId;
+        }
+
+        return ButtonId(0);
+    }
+
     void ViewportUiManager::RemoveCluster(const ClusterId clusterId)
     {
-        if (auto clusterEntry = m_clusters.find(clusterId); clusterEntry != m_clusters.end())
+        if (auto clusterIt = m_clusterButtonGroups.find(clusterId); clusterIt != m_clusterButtonGroups.end())
         {
-            m_clusters.erase(clusterEntry);
-            m_viewportUi->RemoveViewportUiElement(clusterEntry->second->GetViewportUiElementId());
+            m_clusterButtonGroups.erase(clusterIt);
+            m_viewportUi->RemoveViewportUiElement(clusterIt->second->GetViewportUiElementId());
+        }
+    }
+
+    void ViewportUiManager::RemoveSwitcher(SwitcherId switcherId)
+    {
+        if (auto switcherIt = m_switcherButtonGroups.find(switcherId); switcherIt != m_switcherButtonGroups.end())
+        {
+            m_switcherButtonGroups.erase(switcherIt);
+            m_viewportUi->RemoveViewportUiElement(switcherIt->second->GetViewportUiElementId());
         }
     }
 
@@ -93,15 +144,24 @@ namespace AzToolsFramework::ViewportUi
         }
     }
 
-    void ViewportUiManager::SetClusterVisible(ClusterId clusterId, bool visible)
+    void ViewportUiManager::SetClusterVisible(const ClusterId clusterId, bool visible)
     {
-        if (auto clusterEntry = m_clusters.find(clusterId); clusterEntry != m_clusters.end())
+        if (auto clusterIt = m_clusterButtonGroups.find(clusterId); clusterIt != m_clusterButtonGroups.end())
         {
-            auto cluster = clusterEntry->second;
+            auto cluster = clusterIt->second;
             SetViewportUiElementVisible(m_viewportUi.get(), cluster->GetViewportUiElementId(), visible);
         }
     }
 
+    void ViewportUiManager::SetSwitcherVisible(const SwitcherId switcherId, bool visible)
+    {
+        if (auto switcherIt = m_switcherButtonGroups.find(switcherId); switcherIt != m_switcherButtonGroups.end())
+        {
+            auto switcher = switcherIt->second;
+            SetViewportUiElementVisible(m_viewportUi.get(), switcher->GetViewportUiElementId(), visible);
+        }
+    }
+
     void ViewportUiManager::SetClusterGroupVisible(const AZStd::vector<ClusterId>& clusterGroup, bool visible)
     {
         for (auto clusterId : clusterGroup)
@@ -123,9 +183,9 @@ namespace AzToolsFramework::ViewportUi
 
     void ViewportUiManager::SetTextFieldText(TextFieldId textFieldId, const AZStd::string& text)
     {
-        if (auto textFieldEntry = m_textFields.find(textFieldId); textFieldEntry != m_textFields.end())
+        if (auto textFieldIt = m_textFields.find(textFieldId); textFieldIt != m_textFields.end())
         {
-            auto textField = textFieldEntry->second;
+            auto textField = textFieldIt->second;
             textField->m_fieldText = text;
             UpdateTextFieldUi(textField.get());
         }
@@ -134,27 +194,27 @@ namespace AzToolsFramework::ViewportUi
     void ViewportUiManager::RegisterTextFieldCallback(
         TextFieldId textFieldId, AZ::Event<AZStd::string>::Handler& handler) 
     {
-        if (auto textFieldEntry = m_textFields.find(textFieldId); textFieldEntry != m_textFields.end())
+        if (auto textFieldIt = m_textFields.find(textFieldId); textFieldIt != m_textFields.end())
         {
-            auto textField = textFieldEntry->second;
+            auto textField = textFieldIt->second;
             textField->ConnectEventHandler(handler);
         }
     }
 
     void ViewportUiManager::RemoveTextField(TextFieldId textFieldId)
     {
-        if (auto textFieldEntry = m_textFields.find(textFieldId); textFieldEntry != m_textFields.end())
+        if (auto textFieldIt = m_textFields.find(textFieldId); textFieldIt != m_textFields.end())
         {
-            m_textFields.erase(textFieldEntry);
-            m_viewportUi->RemoveViewportUiElement(textFieldEntry->second->m_viewportId);
+            m_textFields.erase(textFieldIt);
+            m_viewportUi->RemoveViewportUiElement(textFieldIt->second->m_viewportId);
         }
     }
 
     void ViewportUiManager::SetTextFieldVisible(TextFieldId textFieldId, bool visible)
     {
-        if (auto textFieldEntry = m_textFields.find(textFieldId); textFieldEntry != m_textFields.end())
+        if (auto textFieldIt = m_textFields.find(textFieldId); textFieldIt != m_textFields.end())
         {
-            auto textField = textFieldEntry->second;
+            auto textField = textFieldIt->second;
             SetViewportUiElementVisible(m_viewportUi.get(), textField->m_viewportId, visible);
         }
     }
@@ -173,10 +233,19 @@ namespace AzToolsFramework::ViewportUi
     void ViewportUiManager::PressButton(ClusterId clusterId, ButtonId buttonId)
     {
         // Find cluster using ID and cluster map
-        if (auto clusterEntry = m_clusters.find(clusterId);
-            clusterEntry != m_clusters.end())
+        if (auto clusterIt = m_clusterButtonGroups.find(clusterId);
+            clusterIt != m_clusterButtonGroups.end())
         {
-            clusterEntry->second->PressButton(buttonId);
+            clusterIt->second->PressButton(buttonId);
+        }
+    }
+
+    void ViewportUiManager::PressButton(SwitcherId switcherId, ButtonId buttonId)
+    {
+        // Find cluster using ID and cluster map
+        if (auto switcherIt = m_switcherButtonGroups.find(switcherId); switcherIt != m_switcherButtonGroups.end())
+        {
+            switcherIt->second->PressButton(buttonId);
         }
     }
 
@@ -196,21 +265,32 @@ namespace AzToolsFramework::ViewportUi
     {
         m_viewportUi->Update();
 
-        for (auto clusterEntry : m_clusters)
+        for (auto buttonGroup : m_clusterButtonGroups)
         {
-            UpdateClusterUi(clusterEntry.second.get());
+            UpdateButtonGroupUi(buttonGroup.second.get());
         }
-        for (auto textFieldEntry : m_textFields)
+        for (auto buttonGroup : m_switcherButtonGroups)
         {
-            UpdateTextFieldUi(textFieldEntry.second.get());
+            UpdateButtonGroupUi(buttonGroup.second.get());
+        }
+        for (auto textField : m_textFields)
+        {
+            UpdateTextFieldUi(textField.second.get());
         }
     }
 
-    ClusterId ViewportUiManager::RegisterNewCluster(AZStd::shared_ptr<Internal::Cluster>& cluster)
+    ClusterId ViewportUiManager::RegisterNewCluster(AZStd::shared_ptr<Internal::ButtonGroup>& buttonGroup)
     {
-        ClusterId newId = ClusterId(m_clusters.size() + 1);
-        cluster->SetClusterId(newId);
-        m_clusters.insert({ newId, cluster });
+        ClusterId newId = ClusterId(m_clusterButtonGroups.size() + 1);
+        m_clusterButtonGroups.insert({ newId, buttonGroup });
+
+        return newId;
+    }
+
+    SwitcherId ViewportUiManager::RegisterNewSwitcher(AZStd::shared_ptr<Internal::ButtonGroup>& buttonGroup)
+    {
+        SwitcherId newId = SwitcherId(m_switcherButtonGroups.size() + 1);
+        m_switcherButtonGroups.insert({newId, buttonGroup});
 
         return newId;
     }
@@ -224,9 +304,9 @@ namespace AzToolsFramework::ViewportUi
         return newId;
     }
 
-    void ViewportUiManager::UpdateClusterUi(Internal::Cluster* cluster)
+    void ViewportUiManager::UpdateButtonGroupUi(Internal::ButtonGroup* buttonGroup)
     {
-        m_viewportUi->UpdateCluster(cluster->GetViewportUiElementId());
+        m_viewportUi->UpdateCluster(buttonGroup->GetViewportUiElementId());
     }
 
     void ViewportUiManager::UpdateTextFieldUi(Internal::TextField* textField)

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h

@@ -1,19 +1,18 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
 #include <AzToolsFramework/ViewportUi/Button.h>
-#include <AzToolsFramework/ViewportUi/Cluster.h>
 #include <AzToolsFramework/ViewportUi/TextField.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiDisplay.h>
 
@@ -21,6 +20,7 @@ namespace AzToolsFramework::ViewportUi
 {
     namespace Internal
     {
+        class ButtonGroup;
         class ViewportUiDisplay;
     }
 
@@ -29,26 +29,32 @@ namespace AzToolsFramework::ViewportUi
     public:
         ViewportUiManager() = default;
         ~ViewportUiManager() = default;
-        
+
         // ViewportUiRequestBus ...
         const ClusterId CreateCluster() override;
+        const SwitcherId CreateSwitcher() override;
         void SetClusterActiveButton(ClusterId clusterId, ButtonId buttonId) override;
+        void SetSwitcherActiveButton(SwitcherId switcherId, ButtonId buttonId) override;
         const ButtonId CreateClusterButton(ClusterId clusterId, const AZStd::string& icon) override;
+        const ButtonId CreateSwitcherButton(
+            SwitcherId switcherId, const AZStd::string& icon, const AZStd::string& name = AZStd::string()) override;
         void RegisterClusterEventHandler(ClusterId clusterId, AZ::Event<ButtonId>::Handler& handler) override;
+        void RegisterSwitcherEventHandler(SwitcherId switcherId, AZ::Event<ButtonId>::Handler& handler) override;
         void RemoveCluster(ClusterId clusterId) override;
+        void RemoveSwitcher(SwitcherId switcherId) override;
         void SetClusterVisible(ClusterId clusterId, bool visible);
+        void SetSwitcherVisible(SwitcherId switcherId, bool visible);
         void SetClusterGroupVisible(const AZStd::vector<ClusterId>& clusterGroup, bool visible) override;
         const TextFieldId CreateTextField(
-            const AZStd::string& labelText, const AZStd::string& textFieldDefaultText,
-            TextFieldValidationType validationType) override;
+            const AZStd::string& labelText, const AZStd::string& textFieldDefaultText, TextFieldValidationType validationType) override;
         void SetTextFieldText(TextFieldId textFieldId, const AZStd::string& text) override;
-        void RegisterTextFieldCallback(
-            TextFieldId textFieldId, AZ::Event<AZStd::string>::Handler& handler) override;
+        void RegisterTextFieldCallback(TextFieldId textFieldId, AZ::Event<AZStd::string>::Handler& handler) override;
         void RemoveTextField(TextFieldId textFieldId) override;
         void SetTextFieldVisible(TextFieldId textFieldId, bool visible) override;
         void CreateComponentModeBorder(const AZStd::string& borderTitle) override;
         void RemoveComponentModeBorder() override;
         void PressButton(ClusterId clusterId, ButtonId buttonId) override;
+        void PressButton(SwitcherId switcherId, ButtonId buttonId) override;
 
         //! Connects to the correct viewportId bus address.
         void ConnectViewportUiBus(const int viewportId);
@@ -60,17 +66,23 @@ namespace AzToolsFramework::ViewportUi
         void Update();
 
     protected:
-        AZStd::unordered_map<ClusterId, AZStd::shared_ptr<Internal::Cluster>> m_clusters; //!< A map of all registered clusters.
-        AZStd::unordered_map<TextFieldId, AZStd::shared_ptr<Internal::TextField>> m_textFields; //!< A map of all registered textFields.
+        AZStd::unordered_map<ClusterId, AZStd::shared_ptr<Internal::ButtonGroup>>
+            m_clusterButtonGroups; //!< A map of all registered Clusters.
+        AZStd::unordered_map<SwitcherId, AZStd::shared_ptr<Internal::ButtonGroup>>
+            m_switcherButtonGroups; //!< A map of all registered Switchers.
+        AZStd::unordered_map<TextFieldId, AZStd::shared_ptr<Internal::TextField>> m_textFields; //!< A map of all registered TextFields.
+
         AZStd::unique_ptr<Internal::ViewportUiDisplay> m_viewportUi; //!< The lower level graphical API for Viewport UI.
 
     private:
-        //! Register a new cluster and return its id.
-        ClusterId RegisterNewCluster(AZStd::shared_ptr<Internal::Cluster>& cluster);
+        //! Register a new Cluster and return its id.
+        ClusterId RegisterNewCluster(AZStd::shared_ptr<Internal::ButtonGroup>& buttonGroup);
+        //! Register a new Switcher and return its id.
+        SwitcherId RegisterNewSwitcher(AZStd::shared_ptr<Internal::ButtonGroup>& buttonGroup);
         //! Register a new text field and return its id.
         TextFieldId RegisterNewTextField(AZStd::shared_ptr<Internal::TextField>& textField);
-        //! Update the corresponding ui element for the given cluster.
-        void UpdateClusterUi(Internal::Cluster* cluster);
+        //! Update the corresponding ui element for the given button group.
+        void UpdateButtonGroupUi(Internal::ButtonGroup* buttonGroup);
         //! Update the corresponding ui element for the given text field.
         void UpdateTextFieldUi(Internal::TextField* textField);
     };

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h

@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -23,11 +23,13 @@ namespace AzToolsFramework::ViewportUi
     using ViewportUiElementId = IdType<struct ViewportUiIdType>;
     using ButtonId = IdType<struct ButtonIdType>;
     using ClusterId = IdType<struct ClusterIdType>;
+    using SwitcherId = IdType<struct SwitcherIdType>;
     using TextFieldId = IdType<struct TextFieldIdType>;
 
     inline const ViewportUiElementId InvalidViewportUiElementId = ViewportUiElementId(0);
     inline const ButtonId InvalidButtonId = ButtonId(0);
     inline const ClusterId InvalidClusterId = ClusterId(0);
+    inline const SwitcherId InvalidSwitcherId = SwitcherId(0);
 
     inline const int DefaultViewportId = 0;
 
@@ -46,27 +48,36 @@ namespace AzToolsFramework::ViewportUi
     public:
         //! Creates and registers a cluster with the Viewport UI system.
         virtual const ClusterId CreateCluster() = 0;
+        //! Creates and registers a switcher with the Viewport UI system.
+        virtual const SwitcherId CreateSwitcher() = 0;
         //! Sets the active button of the cluster. This is the button which will display as highlighted.
         virtual void SetClusterActiveButton(ClusterId clusterId, ButtonId buttonId) = 0;
+        //! Sets the active button of the switcher. This is the button which has a text label.
+        virtual void SetSwitcherActiveButton(SwitcherId clusterId, ButtonId buttonId) = 0;
         //! Registers a new button onto a cluster.
         virtual const ButtonId CreateClusterButton(const ClusterId clusterId, const AZStd::string& icon) = 0;
+        //! Registers a new button onto a switcher.
+        virtual const ButtonId CreateSwitcherButton(
+            SwitcherId switcherId, const AZStd::string& icon, const AZStd::string& name = AZStd::string()) = 0;
         //! Registers an event handler to handle events from the cluster.
         virtual void RegisterClusterEventHandler(ClusterId clusterId, AZ::Event<ButtonId>::Handler& handler) = 0;
+        //! Registers an event handler to handle events from the cluster.
+        virtual void RegisterSwitcherEventHandler(SwitcherId switcherId, AZ::Event<ButtonId>::Handler& handler) = 0;
         //! Removes a cluster from the Viewport UI system.
         virtual void RemoveCluster(ClusterId clusterId) = 0;
+        //!
+        virtual void RemoveSwitcher(SwitcherId switcherId) = 0;
         //! Sets the visibility of the cluster.
         virtual void SetClusterVisible(ClusterId clusterId, bool visible) = 0;
         //! Sets the visibility of multiple clusters.
         virtual void SetClusterGroupVisible(const AZStd::vector<ClusterId>& clusterGroup, bool visible) = 0;
         //! Creates and registers a text field with the Viewport UI system.
         virtual const TextFieldId CreateTextField(
-            const AZStd::string& labelText, const AZStd::string& textFieldDefaultText,
-            TextFieldValidationType validationType) = 0;
+            const AZStd::string& labelText, const AZStd::string& textFieldDefaultText, TextFieldValidationType validationType) = 0;
         //! Set the text that will go inside the text field.
         virtual void SetTextFieldText(TextFieldId textFieldId, const AZStd::string& text) = 0;
         //! Register an event handler to handle when the text field text changes.
-        virtual void RegisterTextFieldCallback(
-            TextFieldId textFieldId, AZ::Event<AZStd::string>::Handler& handler) = 0;
+        virtual void RegisterTextFieldCallback(TextFieldId textFieldId, AZ::Event<AZStd::string>::Handler& handler) = 0;
         //! Removes a text field from the Viewport UI system.
         virtual void RemoveTextField(TextFieldId textFieldId) = 0;
         //! Sets the visibility of the text field.
@@ -77,11 +88,12 @@ namespace AzToolsFramework::ViewportUi
         virtual void RemoveComponentModeBorder() = 0;
         //! Invoke a button press in a cluster.
         virtual void PressButton(ClusterId clusterId, ButtonId buttonId) = 0;
+        //!
+        virtual void PressButton(SwitcherId switcherId, ButtonId buttonId) = 0;
     };
 
     /// The EBusTraits for ViewportInteractionRequests.
-    class ViewportUiBusTraits
-        : public AZ::EBusTraits
+    class ViewportUiBusTraits : public AZ::EBusTraits
     {
     public:
         using BusIdType = int; ///< ViewportId - used to address requests to this EBus.

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp

@@ -0,0 +1,158 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <AzToolsFramework/ViewportUi/ButtonGroup.h>
+#include <AzToolsFramework/ViewportUi/ViewportUiSwitcher.h>
+
+namespace AzToolsFramework::ViewportUi::Internal
+{
+    ViewportUiSwitcher::ViewportUiSwitcher(AZStd::shared_ptr<ButtonGroup> buttonGroup)
+        : m_buttonGroup(buttonGroup)
+    {
+        setOrientation(Qt::Orientation::Horizontal);
+        setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+        setStyleSheet(QString("QToolBar {background-color: none; border: none; spacing: 3px;}"
+                              "QToolButton {background-color: black; border: outset; border-color: white; border-radius: 7px; "
+                              "border-width: 2px; padding: 7px; color: white;}"));
+
+        // Add am empty active button (is set in the call to SetActiveMode)
+        m_activeButton = new QToolButton();
+        // No hover effect for the main button as it's not clickable
+        m_activeButton->setProperty("IconHasHoverEffect", false);
+        m_activeButton->setCheckable(false);
+        m_activeButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+        addWidget(m_activeButton);
+
+        const AZStd::vector<Button*> buttons = buttonGroup->GetButtons();
+
+        for (auto button : buttons)
+        {
+            // Add all the buttons as actions
+            if (button->m_buttonId)
+            {
+                AddButton(button);
+            }
+        }
+    }
+
+    ViewportUiSwitcher::~ViewportUiSwitcher()
+    {
+        delete m_activeButton;
+    }
+
+    void ViewportUiSwitcher::AddButton(Button* button)
+    {
+        QAction* action = new QAction();
+        action->setCheckable(true);
+        action->setIcon(QIcon(QString(button->m_icon.c_str())));
+
+        if (!action)
+        {
+            return;
+        }
+
+        // set hover to true by default
+        action->setProperty("IconHasHoverEffect", true);
+
+        // add the action
+        addAction(action);
+
+        // resize to fit new action with minimum extra space
+        resize(minimumSizeHint());
+
+        const AZStd::function<void()>& callback = [this, button]() { m_buttonGroup->PressButton(button->m_buttonId); };
+        const AZStd::function<void(QAction*)>& updateCallback = [button](QAction* action) {
+            action->setChecked(button->m_state == Button::State::Selected);
+        };
+
+        // connect the callback if provided
+        if (callback)
+        {
+            QObject::connect(action, &QAction::triggered, action, callback);
+        }
+
+        // register the action
+        m_widgetCallbacks.AddWidget(
+            action, [updateCallback](QPointer<QObject> object) { updateCallback(static_cast<QAction*>(object.data())); });
+
+        m_buttonActionMap.insert({button->m_buttonId, action});
+    }
+
+    void ViewportUiSwitcher::RemoveButton(ButtonId buttonId)
+    {
+        if (auto actionEntry = m_buttonActionMap.find(buttonId); actionEntry != m_buttonActionMap.end())
+        {
+            QAction* action = actionEntry->second;
+
+            // remove the action from the toolbar
+            removeAction(action);
+
+            // deregister from the widget manager
+            m_widgetCallbacks.RemoveWidget(action);
+
+            // resize to fit new area with minimum extra space
+            resize(minimumSizeHint());
+
+            m_buttonActionMap.erase(buttonId);
+
+            // reset current active mode if its the button being removed
+            if (buttonId == m_activeButtonId)
+            {
+                if (auto nextEntry = m_buttonActionMap.find(ButtonId(buttonId + 1)); nextEntry != m_buttonActionMap.end())
+                {
+                    SetActiveButton(nextEntry->first);
+                }
+            }
+        }
+    }
+
+    void ViewportUiSwitcher::Update()
+    {
+        m_widgetCallbacks.Update();
+    }
+
+    void ViewportUiSwitcher::SetActiveButton(ButtonId buttonId)
+    {
+        // Check if it is the first active mode to be set
+        bool initialActiveMode = (m_activeButtonId == ButtonId(0));
+
+        // Change the toolbutton's name and icon to that button
+        const AZStd::vector<Button*> buttons = m_buttonGroup->GetButtons();
+        auto found = [buttonId](Button* button) { return (button->m_buttonId == buttonId); };
+
+        if (auto buttonIt = AZStd::find_if(buttons.begin(), buttons.end(), found); buttonIt != buttons.end())
+        {
+            QString buttonName = ((*buttonIt)->m_name).c_str();
+            QIcon buttonIcon = QIcon(QString(((*buttonIt)->m_icon).c_str()));
+            m_activeButton->setIcon(buttonIcon);
+            m_activeButton->setText(buttonName);
+        }
+
+        // Look up button ID in map then remove it from its current position
+        auto itr = m_buttonActionMap.find(buttonId);
+        QAction* action = itr->second;
+        removeAction(action);
+
+        if (!initialActiveMode)
+        {
+            // Add the last action removed
+            if (m_activeButtonId != buttonId)
+            {
+                itr = m_buttonActionMap.find(m_activeButtonId);
+                action = itr->second;
+                addAction(action);
+            }
+        }
+
+        m_activeButtonId = buttonId;
+    }
+} // namespace AzToolsFramework::ViewportUi::Internal

Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.h

@@ -0,0 +1,51 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#pragma once
+
+#include <AzToolsFramework/ViewportUi/Button.h>
+#include <AzCore/std/containers/unordered_map.h>
+#include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.h>
+#include <functional>
+#include <QPointer>
+#include <QToolBar>
+#include <QToolButton>
+
+namespace AzToolsFramework::ViewportUi::Internal
+{
+    class ButtonGroup;
+
+    //! Helper class to make switchers (toolbars) for display in Viewport UI.
+    class ViewportUiSwitcher : public QToolBar
+    {
+        Q_OBJECT
+
+    public:
+        ViewportUiSwitcher(AZStd::shared_ptr<ButtonGroup> buttonGroup);
+        ~ViewportUiSwitcher();
+        //! Adds a new button to the switcher.
+        void AddButton(Button* button);
+        //! Removes a button from the switcher.
+        void RemoveButton(ButtonId buttonId);
+        void Update();
+        //! Changes the m_activeButton.
+        void SetActiveButton(ButtonId buttonId);
+
+    private:
+        QToolButton* m_activeButton; //!< The first button in the toolbar. Only button with a label/text.
+        ButtonId m_activeButtonId = ButtonId(0); //!< ButtonId corresponding to the active button in the buttonActionMap.
+        AZStd::shared_ptr<ButtonGroup> m_buttonGroup; //!< Data structure which the cluster will be displaying to the Viewport UI.
+        AZStd::unordered_map<ButtonId, QPointer<QAction>> m_buttonActionMap; //!< Map for buttons to their corresponding actions.
+        ViewportUiWidgetCallbacks m_widgetCallbacks; //!< Registers actions and manages updates.
+    };
+} // namespace AzToolsFramework::ViewportUi::Internal

Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake

@@ -487,8 +487,8 @@ set(FILES
     Viewport/ViewportTypes.cpp
     ViewportUi/Button.h
     ViewportUi/Button.cpp
-    ViewportUi/Cluster.h
-    ViewportUi/Cluster.cpp
+    ViewportUi/ButtonGroup.h
+    ViewportUi/ButtonGroup.cpp
     ViewportUi/TextField.h
     ViewportUi/TextField.cpp
     ViewportUi/ViewportUiDisplay.h
@@ -500,6 +500,8 @@ set(FILES
     ViewportUi/ViewportUiTextField.cpp
     ViewportUi/ViewportUiCluster.h
     ViewportUi/ViewportUiCluster.cpp
+    ViewportUi/ViewportUiSwitcher.h
+    ViewportUi/ViewportUiSwitcher.cpp
     ViewportUi/ViewportUiWidgetCallbacks.h
     ViewportUi/ViewportUiWidgetCallbacks.cpp
     ViewportUi/ViewportUiDisplayLayout.h
@@ -729,7 +731,7 @@ set(FILES
 # Prevent the following files from being grouped in UNITY builds
 set(SKIP_UNITY_BUILD_INCLUSION_FILES
     # The following files are skipped from unity to avoid duplicated symbols related to an ebus
-    AzToolsFrameworkModule.cpp 
+    AzToolsFrameworkModule.cpp
     Application/ToolsApplication.cpp
     UI/PropertyEditor/PropertyEntityIdCtrl.cpp
     UI/PropertyEditor/PropertyManagerComponent.cpp

Code/Framework/AzToolsFramework/Tests/Entity/EditorEntitySearchComponentTests.cpp

@@ -49,8 +49,8 @@ namespace AzToolsFramework
                             ->Attribute(AZ::Edit::Attributes::AddableByUser, true)
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
                             ->Attribute(AZ::Edit::Attributes::Category, "Entity Search Test Components")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Tag.png")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Tag.png")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Tag.png")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tag.png")
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://www.amazongames.com/")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &EntitySearch_TestComponent1::m_boolValue, "Bool", "")
@@ -108,8 +108,8 @@ namespace AzToolsFramework
                             ->Attribute(AZ::Edit::Attributes::AddableByUser, true)
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
                             ->Attribute(AZ::Edit::Attributes::Category, "Entity Search Test Components")
-                            ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Tag.png")
-                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Tag.png")
+                            ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Tag.png")
+                            ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tag.png")
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://www.amazongames.com/")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &EntitySearch_TestComponent2::m_floatValue, "Float", "")

Code/Framework/AzToolsFramework/Tests/EntityInspectorTests.cpp

@@ -125,8 +125,8 @@ namespace UnitTest
                         ->Attribute(AZ::Edit::Attributes::AddableByUser, true)
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
                         ->Attribute(AZ::Edit::Attributes::Category, "Inspector Test Components")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Tag.png")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Tag.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Tag.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tag.png")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://www.amazongames.com/")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &Inspector_TestComponent2::m_data, "Data", "The component's Data");
@@ -194,8 +194,8 @@ namespace UnitTest
                         ->Attribute(AZ::Edit::Attributes::AddableByUser, true)
                         ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("System"))
                         ->Attribute(AZ::Edit::Attributes::Category, "Inspector Test Components")
-                        ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/Tag.png")
-                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/Tag.png")
+                        ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Tag.png")
+                        ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tag.png")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://www.amazongames.com/")
                         ->DataElement(AZ::Edit::UIHandlers::Default, &Inspector_TestComponent3::m_data, "Data", "The component's Data");

Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabUpdateInstancesBenchmarks.cpp

@@ -78,7 +78,7 @@ namespace Benchmark
     }
     BENCHMARK_REGISTER_F(BM_PrefabUpdateInstances, UpdateInstances_SingeEntityInstances)
         ->RangeMultiplier(10)
-        ->Range(100, 10000)
+        ->Range(100, 1000)
         ->Unit(benchmark::kMillisecond)
         ->Complexity();
 

Code/Framework/AzToolsFramework/Tests/Viewport/ClusterTests.cpp

@@ -20,35 +20,35 @@
 
 namespace UnitTest
 {
-    using Cluster = AzToolsFramework::ViewportUi::Internal::Cluster;
+    using ButtonGroup = AzToolsFramework::ViewportUi::Internal::ButtonGroup;
     using ButtonId = AzToolsFramework::ViewportUi::ButtonId;
 
     TEST(ClusterTest, AddButtonAddsButtonToClusterAndReturnsId)
     {
-        auto cluster = AZStd::make_unique<Cluster>();
-        auto buttonId = cluster->AddButton("");
+        auto buttonGroup = AZStd::make_unique<ButtonGroup>();
+        auto buttonId = buttonGroup->AddButton("");
 
-        auto button = cluster->GetButton(buttonId);
+        auto button = buttonGroup->GetButton(buttonId);
         EXPECT_TRUE(button != nullptr);
     }
 
     TEST(ClusterTest, SetHighlightedButtonChangesButtonStateToSelected)
     {
-        auto cluster = AZStd::make_unique<Cluster>();
-        auto buttonId = cluster->AddButton("");
+        auto buttonGroup = AZStd::make_unique<ButtonGroup>();
+        auto buttonId = buttonGroup->AddButton("");
 
         // check button is not highlighted by default
-        auto button = cluster->GetButton(buttonId);
+        auto button = buttonGroup->GetButton(buttonId);
         EXPECT_FALSE(button->m_state == AzToolsFramework::ViewportUi::Internal::Button::State::Selected);
 
-        cluster->SetHighlightedButton(buttonId);
+        buttonGroup->SetHighlightedButton(buttonId);
         EXPECT_TRUE(button->m_state == AzToolsFramework::ViewportUi::Internal::Button::State::Selected);
     }
 
     TEST(ClusterTest, ConnectEventHandlerConnectsHandlerToButtonTriggeredEvent)
     {
-        auto cluster = AZStd::make_unique<Cluster>();
-        auto buttonId = cluster->AddButton("");
+        auto buttonGroup = AZStd::make_unique<ButtonGroup>();
+        auto buttonId = buttonGroup->AddButton("");
 
         // create a handler which will be triggered by the cluster
         bool handlerTriggered = false;
@@ -62,8 +62,8 @@ namespace UnitTest
                 }
             });
 
-        cluster->ConnectEventHandler(handler);
-        cluster->PressButton(buttonId);
+        buttonGroup->ConnectEventHandler(handler);
+        buttonGroup->PressButton(buttonId);
 
         EXPECT_TRUE(handlerTriggered);
     }

Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiClusterTests.cpp

@@ -13,7 +13,7 @@
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzFramework/Viewport/ViewportScreen.h>
 #include <AzTest/AzTest.h>
-#include <AzToolsFramework/ViewportUi/Cluster.h>
+#include <AzToolsFramework/ViewportUi/ButtonGroup.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiCluster.h>
 #include <QAction>
 #include <QApplication>
@@ -23,14 +23,14 @@
 namespace UnitTest
 {
     using ViewportUiCluster = AzToolsFramework::ViewportUi::Internal::ViewportUiCluster;
-    using Cluster = AzToolsFramework::ViewportUi::Internal::Cluster;
+    using ButtonGroup = AzToolsFramework::ViewportUi::Internal::ButtonGroup;
     using Button = AzToolsFramework::ViewportUi::Internal::Button;
     using ButtonId = AzToolsFramework::ViewportUi::ButtonId;
 
     TEST(ViewportUiCluster, RegisterButtonIncreasesClusterHeight)
     {
-        auto clusterInfo = AZStd::make_shared<Cluster>();
-        ViewportUiCluster viewportUiCluster(clusterInfo);
+        auto buttonGroup = AZStd::make_shared<ButtonGroup>();
+        ViewportUiCluster viewportUiCluster(buttonGroup);
         viewportUiCluster.resize(viewportUiCluster.minimumSizeHint());
 
         // need to initialize cluster with a single button or size will be invalid
@@ -48,8 +48,8 @@ namespace UnitTest
 
     TEST(ViewportUiCluster, RemoveClusterButtonDecreasesClusterHeight)
     {
-        auto clusterInfo = AZStd::make_shared<Cluster>();
-        ViewportUiCluster viewportUiCluster(clusterInfo);
+        auto buttonGroup = AZStd::make_shared<ButtonGroup>();
+        ViewportUiCluster viewportUiCluster(buttonGroup);
         viewportUiCluster.resize(viewportUiCluster.minimumSizeHint());
 
         // need to initialize cluster with a single button or size will be invalid
@@ -70,8 +70,8 @@ namespace UnitTest
 
     TEST(ViewportUiCluster, UpdateChangesActiveButton)
     {
-        auto clusterInfo = AZStd::make_shared<Cluster>();
-        ViewportUiCluster viewportUiCluster(clusterInfo);
+        auto buttonGroup = AZStd::make_shared<ButtonGroup>();
+        ViewportUiCluster viewportUiCluster(buttonGroup);
 
         // register a button to the cluster
         auto button = AZStd::make_unique<Button>("", ButtonId(1));
@@ -93,8 +93,8 @@ namespace UnitTest
 
     TEST(ViewportUiCluster, TriggeringActionTriggersClusterEventForButton)
     {
-        auto clusterInfo = AZStd::make_shared<Cluster>();
-        ViewportUiCluster viewportUiCluster(clusterInfo);
+        auto buttonGroup = AZStd::make_shared<ButtonGroup>();
+        ViewportUiCluster viewportUiCluster(buttonGroup);
 
         // create a handler which will be triggered by the button
         bool handlerTriggered = false;
@@ -107,7 +107,7 @@ namespace UnitTest
                     handlerTriggered = true;
                 }
             });
-        clusterInfo->ConnectEventHandler(handler);
+        buttonGroup->ConnectEventHandler(handler);
 
         // register the button
         auto button = AZStd::make_unique<Button>("", testButtonId);

Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiDisplayTests.cpp

@@ -23,10 +23,10 @@ namespace UnitTest
 {
     using ViewportUiDisplay = AzToolsFramework::ViewportUi::Internal::ViewportUiDisplay;
     using ViewportUiElementId = AzToolsFramework::ViewportUi::ViewportUiElementId;
-    using Cluster = AzToolsFramework::ViewportUi::Internal::Cluster;
+    using ButtonGroup = AzToolsFramework::ViewportUi::Internal::ButtonGroup;
 
     // sets up a parent widget and render overlay to attach the Viewport UI to
-    // as well as a cluster with one button
+    // as well as a button group with one button
     class ViewportUiDisplayTestFixture : public ::testing::Test
     {
     public:
@@ -34,22 +34,22 @@ namespace UnitTest
 
         void SetUp()
         {
-            m_cluster = AZStd::make_shared<Cluster>();
-            m_cluster->AddButton("");
+            m_buttonGroup = AZStd::make_shared<ButtonGroup>();
+            m_buttonGroup->AddButton("");
             m_parentWidget = new QWidget();
             m_mockRenderOverlay = new QWidget();
         }
 
         void TearDown()
         {
-            m_cluster.reset();
+            m_buttonGroup.reset();
             delete m_parentWidget;
             delete m_mockRenderOverlay;
         }
 
         QWidget* m_parentWidget = nullptr;
         QWidget* m_mockRenderOverlay = nullptr;
-        AZStd::shared_ptr<Cluster> m_cluster = nullptr;
+        AZStd::shared_ptr<ButtonGroup> m_buttonGroup = nullptr;
     };
 
     TEST_F(ViewportUiDisplayTestFixture, ViewportUiInitializationReturnsProperlyParentedWidgets)
@@ -72,13 +72,13 @@ namespace UnitTest
     TEST_F(ViewportUiDisplayTestFixture, RemoveViewportUiElementRemovesElementFromViewportUi)
     {
         ViewportUiDisplay viewportUi(m_parentWidget, m_mockRenderOverlay);
-        viewportUi.AddCluster(m_cluster);
-        auto widget = viewportUi.GetViewportUiElement(m_cluster->GetViewportUiElementId());
+        viewportUi.AddCluster(m_buttonGroup);
+        auto widget = viewportUi.GetViewportUiElement(m_buttonGroup->GetViewportUiElementId());
 
         EXPECT_TRUE(widget.get() != nullptr);
 
-        viewportUi.RemoveViewportUiElement(m_cluster->GetViewportUiElementId());
-        widget = viewportUi.GetViewportUiElement(m_cluster->GetViewportUiElementId());
+        viewportUi.RemoveViewportUiElement(m_buttonGroup->GetViewportUiElementId());
+        widget = viewportUi.GetViewportUiElement(m_buttonGroup->GetViewportUiElementId());
 
         EXPECT_TRUE(widget.get() == nullptr);
     }
@@ -89,11 +89,11 @@ namespace UnitTest
 
         ViewportUiDisplay viewportUi(m_parentWidget, m_mockRenderOverlay);
         viewportUi.InitializeUiOverlay();
-        viewportUi.AddCluster(m_cluster);
+        viewportUi.AddCluster(m_buttonGroup);
         viewportUi.Update();
-        viewportUi.ShowViewportUiElement(m_cluster->GetViewportUiElementId());
+        viewportUi.ShowViewportUiElement(m_buttonGroup->GetViewportUiElementId());
 
-        EXPECT_TRUE(viewportUi.IsViewportUiElementVisible(m_cluster->GetViewportUiElementId()));
+        EXPECT_TRUE(viewportUi.IsViewportUiElementVisible(m_buttonGroup->GetViewportUiElementId()));
     }
 
     TEST_F(ViewportUiDisplayTestFixture, HideViewportUiElementSetsWidgetVisibilityToFalse)
@@ -102,20 +102,20 @@ namespace UnitTest
 
         ViewportUiDisplay viewportUi(m_parentWidget, m_mockRenderOverlay);
         viewportUi.InitializeUiOverlay();
-        viewportUi.AddCluster(m_cluster);
-        viewportUi.HideViewportUiElement(m_cluster->GetViewportUiElementId());
+        viewportUi.AddCluster(m_buttonGroup);
+        viewportUi.HideViewportUiElement(m_buttonGroup->GetViewportUiElementId());
 
-        EXPECT_FALSE(viewportUi.IsViewportUiElementVisible(m_cluster->GetViewportUiElementId()));
+        EXPECT_FALSE(viewportUi.IsViewportUiElementVisible(m_buttonGroup->GetViewportUiElementId()));
     }
 
     TEST_F(ViewportUiDisplayTestFixture, UpdateUiOverlayGeometryChangesGeometryToMatchViewportUiElements)
     {
         ViewportUiDisplay viewportUi(m_parentWidget, m_mockRenderOverlay);
         viewportUi.InitializeUiOverlay();
-        viewportUi.AddCluster(m_cluster);
+        viewportUi.AddCluster(m_buttonGroup);
 
         viewportUi.Update();
-        auto widget = viewportUi.GetViewportUiElement(m_cluster->GetViewportUiElementId());
+        auto widget = viewportUi.GetViewportUiElement(m_buttonGroup->GetViewportUiElementId());
 
         EXPECT_EQ(viewportUi.GetUiMainWindow()->mask(), widget->geometry());
     }
@@ -127,14 +127,14 @@ namespace UnitTest
         ViewportUiDisplay viewportUi(m_parentWidget, m_mockRenderOverlay);
         viewportUi.InitializeUiOverlay();
 
-        auto cluster = AZStd::make_shared<Cluster>();
-        cluster->AddButton("");
-        viewportUi.AddCluster(cluster);
+        auto buttonGroup = AZStd::make_shared<ButtonGroup>();
+        buttonGroup->AddButton("");
+        viewportUi.AddCluster(buttonGroup);
         viewportUi.Update();
 
         EXPECT_TRUE(viewportUi.GetUiMainWindow()->isVisible());
 
-        viewportUi.RemoveViewportUiElement(cluster->GetViewportUiElementId());
+        viewportUi.RemoveViewportUiElement(buttonGroup->GetViewportUiElementId());
         viewportUi.Update();
         EXPECT_FALSE(viewportUi.GetUiMainWindow()->isVisible());
     }

Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiManagerTests.cpp

@@ -22,19 +22,19 @@ namespace UnitTest
 {
     using ViewportUiDisplay = AzToolsFramework::ViewportUi::Internal::ViewportUiDisplay;
     using ViewportUiElementId = AzToolsFramework::ViewportUi::ViewportUiElementId;
-    using Cluster = AzToolsFramework::ViewportUi::Internal::Cluster;
+    using ButtonGroup = AzToolsFramework::ViewportUi::Internal::ButtonGroup;
     using ButtonId = AzToolsFramework::ViewportUi::ButtonId;
 
-    // child class of ViewportUiManager which exposes the protected cluster and viewport display
+    // child class of ViewportUiManager which exposes the protected button group and viewport display
     class ViewportUiManagerTestable : public AzToolsFramework::ViewportUi::ViewportUiManager
     {
     public:
         ViewportUiManagerTestable() = default;
         ~ViewportUiManagerTestable() = default;
 
-        const AZStd::unordered_map<AzToolsFramework::ViewportUi::ClusterId, AZStd::shared_ptr<Cluster>>& GetClusterMap()
+        const AZStd::unordered_map<AzToolsFramework::ViewportUi::ClusterId, AZStd::shared_ptr<ButtonGroup>>& GetClusterMap()
         {
-            return m_clusters;
+            return m_clusterButtonGroups;
         }
 
         ViewportUiDisplay* GetViewportUiDisplay()

Code/LauncherUnified/Launcher.cpp

@@ -449,18 +449,14 @@ namespace O3DELauncher
 
         // Non-host platforms cannot use the project path that is #defined within the launcher.
         // In this case the the result of AZ::Utils::GetDefaultAppRoot is used instead
+#if !AZ_TRAIT_OS_IS_HOST_OS_PLATFORM
         AZStd::string_view projectPath;
-#if AZ_TRAIT_OS_IS_HOST_OS_PLATFORM
-        // Insert the project_path option to the front of the command line arguments
-        projectPath = GetProjectPath();
-#else
         // Make sure the defaultAppRootPath variable is in scope long enough until the projectPath string_view is used below
         AZStd::optional<AZ::IO::FixedMaxPathString> defaultAppRootPath = AZ::Utils::GetDefaultAppRootPath();
         if (defaultAppRootPath.has_value())
         {
             projectPath = *defaultAppRootPath;
         }
-#endif
         if (!projectPath.empty())
         {
             const auto projectPathKey = FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)
@@ -471,15 +467,14 @@ namespace O3DELauncher
 
             // For non-host platforms set the engine root to be the project root
             // Since the directories available during execution are limited on those platforms
-#if !AZ_TRAIT_OS_IS_HOST_OS_PLATFORM
             AZStd::string_view enginePath = projectPath;
             const auto enginePathKey = FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)
                 + "/engine_path";
             enginePathOptionOverride = FixedValueString ::format(R"(--regset="%s=%.*s")",
                 enginePathKey.c_str(), aznumeric_cast<int>(enginePath.size()), enginePath.data());
             argContainer.emplace_back(enginePathOptionOverride.data());
-#endif
         }
+#endif
 
         AzGameFramework::GameApplication gameApplication(aznumeric_cast<int>(argContainer.size()), argContainer.data());
         // The settings registry has been created by the AZ::ComponentApplication constructor at this point

Code/LauncherUnified/LauncherProject.cpp

@@ -36,15 +36,4 @@ namespace O3DELauncher
 #endif
         return { LY_PROJECT_NAME };
     }
-
-    AZStd::string_view GetProjectPath()
-    {
-        // The Project CMake path optional and not required
-        // It is used as fall back project root path
-#if defined LY_PROJECT_CMAKE_PATH
-        return { LY_PROJECT_CMAKE_PATH };
-#else
-        return {};
-#endif
-    }
 }

Code/LauncherUnified/launcher_generator.cmake

@@ -130,9 +130,6 @@ foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJEC
             PRIVATE
                 # Adds the name of the project/game
                 LY_PROJECT_NAME="${project_name}"
-                # Adds the project path supplied to CMake during configuration
-                # This is used as a fallback to launch the AssetProcessor
-                LY_PROJECT_CMAKE_PATH="${project_path}"
                 # Adds the ${project_name}_GameLauncher target as a define so for the Settings Registry to use
                 # when loading .setreg file specializations
                 # This is needed so that only gems for the project game launcher are loaded
@@ -174,9 +171,6 @@ foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJEC
                     PRIVATE
                         # Adds the name of the project/game
                         LY_PROJECT_NAME="${project_name}"
-                        # Adds the project path supplied to CMake during configuration
-                        # This is used as a fallback to launch the AssetProcessor
-                        LY_PROJECT_CMAKE_PATH="${project_path}"
                         # Adds the ${project_name}_ServerLauncher target as a define so for the Settings Registry to use
                         # when loading .setreg file specializations
                         # This is needed so that only gems for the project server launcher are loaded

Code/Sandbox/Editor/Alembic/AlembicCompileDialog.cpp

@@ -19,6 +19,8 @@
 #include <QPushButton>
 
 // AzCore
+#include <AzCore/Utils/Utils.h>
+
 #include <Pak/CryPakUtils.h>
 
 // Editor
@@ -70,12 +72,13 @@ void CAlembicCompileDialog::OnInitDialog()
 
     SDirectoryEnumeratorHelper dirHelper;
 
-    dirHelper.ScanDirectoryRecursive(gEnv->pCryPak, "@engroot@/", "Editor/Presets/GeomCache", filePattern, presetFiles);
+    auto engineAssetSourceRoot = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets";
+    dirHelper.ScanDirectoryRecursive(gEnv->pCryPak, engineAssetSourceRoot.c_str(), "Editor/Presets/GeomCache", filePattern, presetFiles);
 
     for (auto iter = presetFiles.begin(); iter != presetFiles.end(); ++iter)
     {
         const auto& file = *iter;
-        const AZStd::string filePath = "@engroot@/" + file;
+        const AZ::IO::FixedMaxPath filePath = engineAssetSourceRoot / file;
         m_presets.push_back(LoadConfig(Path::GetFileName(file.c_str()), XmlHelpers::LoadXmlFromFile(filePath.c_str())));
         m_ui->m_presetComboBox->addItem(m_presets.back().m_name);
     }

Code/Sandbox/Editor/CryEdit.cpp

@@ -149,7 +149,6 @@ AZ_POP_DISABLE_WARNING
 #include "LevelFileDialog.h"
 #include "LevelIndependentFileMan.h"
 #include "WelcomeScreen/WelcomeScreenDialog.h"
-#include "Dialogs/DuplicatedObjectsHandlerDlg.h"
 
 #include "Controls/ReflectedPropertyControl/PropertyCtrl.h"
 #include "Controls/ReflectedPropertyControl/ReflectedVar.h"
@@ -400,9 +399,7 @@ void CCryEditApp::RegisterActionHandlers()
     ON_COMMAND(ID_OBJECTMODIFY_UNFREEZE, OnObjectmodifyUnfreeze)
     ON_COMMAND(ID_UNDO, OnUndo)
     ON_COMMAND(ID_TOOLBAR_WIDGET_REDO, OnUndo)     // Can't use the same ID, because for the menu we can't have a QWidgetAction, while for the toolbar we want one
-    ON_COMMAND(ID_SELECTION_SAVE, OnSelectionSave)
     ON_COMMAND(ID_IMPORT_ASSET, OnOpenAssetImporter)
-    ON_COMMAND(ID_SELECTION_LOAD, OnSelectionLoad)
     ON_COMMAND(ID_LOCK_SELECTION, OnLockSelection)
     ON_COMMAND(ID_EDIT_LEVELDATA, OnEditLevelData)
     ON_COMMAND(ID_FILE_EDITLOGFILE, OnFileEditLogFile)
@@ -1157,9 +1154,9 @@ BOOL CCryEditApp::CheckIfAlreadyRunning()
         m_mutexApplication = new QSharedMemory(O3DEApplicationName);
         if (!m_mutexApplication->create(16))
         {
-            // Don't prompt the user in non-interactive export mode.  Instead, default to allowing multiple instances to 
-            // run simultaneously, so that multiple level exports can be run in parallel on the same machine.  
-            // NOTE:  If you choose to do this, be sure to export *different* levels, since nothing prevents multiple runs 
+            // Don't prompt the user in non-interactive export mode.  Instead, default to allowing multiple instances to
+            // run simultaneously, so that multiple level exports can be run in parallel on the same machine.
+            // NOTE:  If you choose to do this, be sure to export *different* levels, since nothing prevents multiple runs
             // from trying to write to the same level at the same time.
             // If we're running interactively, let's ask and make sure the user actually intended to do this.
             if (!m_bExportMode && QMessageBox::question(AzToolsFramework::GetActiveWindow(), QObject::tr("Too many apps"), QObject::tr("There is already an Open 3D Engine application running\nDo you want to start another one?")) != QMessageBox::Yes)
@@ -1720,7 +1717,7 @@ BOOL CCryEditApp::InitInstance()
     AzQtComponents::StyleManager::addSearchPaths(
         QStringLiteral("style"),
         engineRoot.filePath(QStringLiteral("Code/Sandbox/Editor/Style")),
-        QStringLiteral(":/Editor/Style"),
+        QStringLiteral(":/Assets/Editor/Style"),
         engineRootPath);
     AzQtComponents::StyleManager::setStyleSheet(mainWindow, QStringLiteral("style:Editor.qss"));
 
@@ -3019,149 +3016,12 @@ void CCryEditApp::OnFileExportOcclusionMesh()
     pExportManager->Export(levelName.toUtf8().data(), "ocm", levelPath.toUtf8().data(), false, false, true);
 }
 
-void CCryEditApp::OnSelectionSave()
-{
-    char szFilters[] = "Object Group Files (*.grp)";
-    QtUtil::QtMFCScopedHWNDCapture cap;
-    CAutoDirectoryRestoreFileDialog dlg(QFileDialog::AcceptSave, QFileDialog::AnyFile, "grp", {}, szFilters, {}, {}, cap);
-
-    if (dlg.exec())
-    {
-        QWaitCursor wait;
-        CSelectionGroup* sel = GetIEditor()->GetSelection();
-        //CXmlArchive xmlAr( "Objects" );
-
-
-        XmlNodeRef root = XmlHelpers::CreateXmlNode("Objects");
-        CObjectArchive ar(GetIEditor()->GetObjectManager(), root, false);
-        // Save all objects to XML.
-        for (int i = 0; i < sel->GetCount(); i++)
-        {
-            ar.SaveObject(sel->GetObject(i));
-        }
-        QString fileName = dlg.selectedFiles().first();
-        XmlHelpers::SaveXmlNode(GetIEditor()->GetFileUtil(), root, fileName.toStdString().c_str());
-        //xmlAr.Save( dlg.GetPathName() );
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////
-struct SDuplicatedObject
-{
-    SDuplicatedObject(const QString& name, const GUID& id)
-    {
-        m_name = name;
-        m_id = id;
-    }
-    QString m_name;
-    GUID m_id;
-};
-
-void GatherAllObjects(XmlNodeRef node, std::vector<SDuplicatedObject>& outDuplicatedObjects)
-{
-    if (!azstricmp(node->getTag(), "Object"))
-    {
-        GUID guid;
-        if (node->getAttr("Id", guid))
-        {
-            if (GetIEditor()->GetObjectManager()->FindObject(guid))
-            {
-                QString name;
-                node->getAttr("Name", name);
-                outDuplicatedObjects.push_back(SDuplicatedObject(name, guid));
-            }
-        }
-    }
-
-    for (int i = 0, nChildCount(node->getChildCount()); i < nChildCount; ++i)
-    {
-        XmlNodeRef childNode = node->getChild(i);
-        if (childNode == NULL)
-        {
-            continue;
-        }
-        GatherAllObjects(childNode, outDuplicatedObjects);
-    }
-}
-
 void CCryEditApp::OnOpenAssetImporter()
 {
     QtViewPaneManager::instance()->OpenPane(LyViewPane::SceneSettings);
 }
 
-void CCryEditApp::OnSelectionLoad()
-{
-    // Load objects from .grp file.
-    QtUtil::QtMFCScopedHWNDCapture cap;
-    CAutoDirectoryRestoreFileDialog dlg(QFileDialog::AcceptOpen, QFileDialog::ExistingFile, "grp", {}, "Object Group Files (*.grp)", {}, {}, cap);
-    if (dlg.exec() != QDialog::Accepted)
-    {
-        return;
-    }
-
-    QWaitCursor wait;
-
-    XmlNodeRef root = XmlHelpers::LoadXmlFromFile(dlg.selectedFiles().first().toStdString().c_str());
-    if (!root)
-    {
-        QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Error at loading group file."));
-        return;
-    }
-
-    std::vector<SDuplicatedObject> duplicatedObjects;
-    GatherAllObjects(root, duplicatedObjects);
-
-    CDuplicatedObjectsHandlerDlg::EResult result(CDuplicatedObjectsHandlerDlg::eResult_None);
-    int nDuplicatedObjectSize(duplicatedObjects.size());
-
-    if (!duplicatedObjects.empty())
-    {
-        QString msg = QObject::tr("The following object(s) already exist(s) in the level.\r\n\r\n");
-
-        for (int i = 0; i < nDuplicatedObjectSize; ++i)
-        {
-            msg += QStringLiteral("\t");
-            msg += duplicatedObjects[i].m_name;
-            if (i < nDuplicatedObjectSize - 1)
-            {
-                msg += QStringLiteral("\r\n");
-            }
-        }
-
-        CDuplicatedObjectsHandlerDlg confirmDlg(msg);
-        if (confirmDlg.exec() == QDialog::Rejected)
-        {
-            return;
-        }
-        result = confirmDlg.GetResult();
-    }
-
-    CUndo undo("Load Objects");
-    GetIEditor()->ClearSelection();
-
-    CObjectArchive ar(GetIEditor()->GetObjectManager(), root, true);
-
-    if (result == CDuplicatedObjectsHandlerDlg::eResult_Override)
-    {
-        for (int i = 0; i < nDuplicatedObjectSize; ++i)
-        {
-            CBaseObject* pObj = GetIEditor()->GetObjectManager()->FindObject(duplicatedObjects[i].m_id);
-            if (pObj)
-            {
-                GetIEditor()->GetObjectManager()->DeleteObject(pObj);
-            }
-        }
-    }
-    else if (result == CDuplicatedObjectsHandlerDlg::eResult_CreateCopies)
-    {
-        ar.MakeNewIds(true);
-    }
-
-    GetIEditor()->GetObjectManager()->LoadObjects(ar, true);
-    GetIEditor()->SetModifiedFlag();
-    GetIEditor()->SetModifiedModule(eModifiedBrushes);
-}
-
 //////////////////////////////////////////////////////////////////////////
 void CCryEditApp::OnUpdateSelected(QAction* action)
 {

Code/Sandbox/Editor/CryEdit.h

@@ -232,9 +232,7 @@ public:
     void OnObjectmodifyFreeze();
     void OnObjectmodifyUnfreeze();
     void OnUndo();
-    void OnSelectionSave();
     void OnOpenAssetImporter();
-    void OnSelectionLoad();
     void OnUpdateSelected(QAction* action);
     void OnLockSelection();
     void OnEditLevelData();

Code/Sandbox/Editor/CryEditDoc.cpp

@@ -83,7 +83,7 @@ static const char* kHoldFolder = "$tmp_hold"; // conform to the ignored file typ
 static const char* kSaveBackupFolder = "_savebackup";
 static const char* kResizeTempFolder = "$tmp_resize"; // conform to the ignored file types $tmp[0-9]*_ regex
 
-static const char* kBackupOrTempFolders[] = 
+static const char* kBackupOrTempFolders[] =
 {
     kAutoBackupFolder,
     kHoldFolder,
@@ -1164,7 +1164,7 @@ bool CCryEditDoc::OnSaveDocument(const QString& lpszPathName)
         {
             DoSaveDocument(lpszPathName, context);
             saveSuccess = AfterSaveDocument(lpszPathName, context);
-        }     
+        }
     }
 
     return saveSuccess;
@@ -1436,7 +1436,7 @@ bool CCryEditDoc::SaveLevel(const QString& filename)
     // Save AZ entities to the editor level.
 
     bool contentsAllSaved = false; // abort level save if anything within it fails
-    
+
     auto tempFilenameStrData = tempSaveFile.toStdString();
     auto filenameStrData = fullPathName.toStdString();
 
@@ -1458,7 +1458,7 @@ bool CCryEditDoc::SaveLevel(const QString& filename)
             }
         }
 
-        
+
         AZStd::vector<AZ::Entity*> editorEntities;
         AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
             &AzToolsFramework::EditorEntityContextRequestBus::Events::GetLooseEditorEntities,
@@ -1815,7 +1815,7 @@ bool CCryEditDoc::LoadLevel(TDocMultiArchive& arrXmlAr, const QString& absoluteC
     AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
 
     auto pIPak = GetIEditor()->GetSystem()->GetIPak();
-    
+
     QString folderPath = QFileInfo(absoluteCryFilePath).absolutePath();
 
     OnStartLevelResourceList();
@@ -2391,7 +2391,8 @@ void CCryEditDoc::InitEmptyLevel(int /*resolution*/, int /*unitSize*/, bool /*bU
         GetIEditor()->GetGameEngine()->SetLevelCreated(false);
 
         // Default time of day.
-        XmlNodeRef root = GetISystem()->LoadXmlFromFile("@engroot@/Editor/default_time_of_day.xml");
+        auto defaultTimeOfDayPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets" / "Editor" / "default_time_of_day.xml";
+        XmlNodeRef root = GetISystem()->LoadXmlFromFile(defaultTimeOfDayPath.c_str());
         if (root)
         {
             ITimeOfDay* pTimeOfDay = gEnv->p3DEngine ? gEnv->p3DEngine->GetTimeOfDay() : nullptr;
@@ -2454,7 +2455,7 @@ void CCryEditDoc::CreateDefaultLevelAssets(int resolution, int unitSize)
 
                     AZ::Transform worldTransform = AZ::Transform::CreateIdentity();
                     worldTransform = AZ::Transform::CreateTranslation(AZ::Vector3(halfTerrainSize, halfTerrainSize, m_envProbeHeight / 2));
-                
+
                     AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusConnect();
                     GetIEditor()->SuspendUndo();
                     AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Broadcast(
@@ -2613,7 +2614,7 @@ void CCryEditDoc::OnSliceInstantiated(const AZ::Data::AssetId& sliceAssetId, AZ:
         sliceAddress.SetReference(nullptr);
         SetModifiedFlag(true);
         SetModifiedModules(eModifiedEntities);
-        
+
         AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusDisconnect();
 
         //save after level default slice fully instantiated

Code/Sandbox/Editor/Dialogs/DuplicatedObjectsHandlerDlg.cpp

@@ -1,51 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#include "EditorDefs.h"
-
-#include "DuplicatedObjectsHandlerDlg.h"
-
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-#include <Dialogs/ui_DuplicatedObjectsHandlerDlg.h>
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-
-CDuplicatedObjectsHandlerDlg::CDuplicatedObjectsHandlerDlg(const QString& msg, QWidget* pParent)
-    : QDialog(pParent)
-    , m_ui(new Ui::DuplicatedObjectsHandlerDlg)
-{
-    m_ui->setupUi(this);
-    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-    m_ui->textBrowser->setPlainText(msg);
-
-    connect(m_ui->buttonOverride, &QPushButton::clicked, this, &CDuplicatedObjectsHandlerDlg::OnBnClickedOverrideBtn);
-    connect(m_ui->buttonCreateCopies, &QPushButton::clicked, this, &CDuplicatedObjectsHandlerDlg::OnBnClickedCreateCopiesBtn);
-}
-
-CDuplicatedObjectsHandlerDlg::~CDuplicatedObjectsHandlerDlg()
-{
-}
-
-void CDuplicatedObjectsHandlerDlg::OnBnClickedOverrideBtn()
-{
-    m_result = eResult_Override;
-    accept();
-}
-
-void CDuplicatedObjectsHandlerDlg::OnBnClickedCreateCopiesBtn()
-{
-    m_result = eResult_CreateCopies;
-    accept();
-}
-
-#include <Dialogs/moc_DuplicatedObjectsHandlerDlg.cpp>

Code/Sandbox/Editor/Dialogs/DuplicatedObjectsHandlerDlg.h

@@ -1,57 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-// Original file Copyright Crytek GMBH or its affiliates, used under license.
-
-#ifndef CRYINCLUDE_EDITOR_DIALOGS_DUPLICATEDOBJECTSHANDLERDLG_H
-#define CRYINCLUDE_EDITOR_DIALOGS_DUPLICATEDOBJECTSHANDLERDLG_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#endif
-
-namespace Ui
-{
-    class DuplicatedObjectsHandlerDlg;
-}
-
-class CDuplicatedObjectsHandlerDlg
-    : public QDialog
-{
-    Q_OBJECT
-public:
-    CDuplicatedObjectsHandlerDlg(const QString& msg, QWidget* pParent = nullptr);
-    virtual ~CDuplicatedObjectsHandlerDlg();
-
-    enum EResult
-    {
-        eResult_None,
-        eResult_Override,
-        eResult_CreateCopies
-    };
-
-    EResult GetResult() const
-    {
-        return m_result;
-    }
-
-protected:
-
-    EResult m_result;
-
-    void OnBnClickedOverrideBtn();
-    void OnBnClickedCreateCopiesBtn();
-
-    QScopedPointer<Ui::DuplicatedObjectsHandlerDlg> m_ui;
-};
-
-#endif // CRYINCLUDE_EDITOR_DIALOGS_DUPLICATEDOBJECTSHANDLERDLG_H

Code/Sandbox/Editor/Dialogs/DuplicatedObjectsHandlerDlg.ui

@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DuplicatedObjectsHandlerDlg</class>
- <widget class="QDialog" name="DuplicatedObjectsHandlerDlg">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>474</width>
-    <height>204</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Duplicated Objects Dialog</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QTextBrowser" name="textBrowser">
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="pushButton">
-       <property name="text">
-        <string>Cancel</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonOverride">
-       <property name="text">
-        <string>Override</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonCreateCopies">
-       <property name="text">
-        <string>Create Copies</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>pushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>DuplicatedObjectsHandlerDlg</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>258</x>
-     <y>183</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>190</x>
-     <y>184</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

Code/Sandbox/Editor/Dialogs/PythonScriptsDialog.cpp

@@ -71,24 +71,8 @@ CPythonScriptsDialog::CPythonScriptsDialog(QWidget* parent)
     AzQtComponents::LineEdit::applySearchStyle(ui->searchField);
 
     QStringList scriptFolders;
-
-    const auto editorEnvStr = gSettings.strEditorEnv.toLocal8Bit();
-    AZStd::string editorScriptsPath = AZStd::string::format("@engroot@/%s", editorEnvStr.constData());
-    XmlNodeRef envNode = XmlHelpers::LoadXmlFromFile(editorScriptsPath.c_str());
-    if (envNode)
-    {
-        QString scriptPath;
-        int childrenCount = envNode->getChildCount();
-        for (int idx = 0; idx < childrenCount; ++idx)
-        {
-            XmlNodeRef child = envNode->getChild(idx);
-            if (child->haveAttr("scriptPath"))
-            {
-                scriptPath = child->getAttr("scriptPath");
-                scriptFolders.push_back(scriptPath);
-            }
-        }
-    }
+    auto engineScriptPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets" / "Editor" / "Scripts";
+    scriptFolders.push_back(engineScriptPath.c_str());
 
     AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
     ScanFolderForScripts(QString("%1/Editor/Scripts").arg(projectPath.c_str()), scriptFolders);

Code/Sandbox/Editor/Dialogs/QT/NewEntityDialog.cpp

@@ -1,218 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#include "EditorDefs.h"
-
-#include "NewEntityDialog.h"
-
-// Qt
-#include <QPushButton>
-#include <QToolTip>
-#include <QMessageBox>
-
-// Editor
-#include "Dialogs/QT/ui_NewEntityDialog.h"
-
-
-NewEntityDialog::NewEntityDialog(QWidget* parent)
-    : QDialog(parent)
-    , ui(new Ui::NewEntityDialog)
-{
-    entityNameValidator = new EntityNameValidator(this);
-
-    ui->setupUi(this);
-
-    ui->entityName->setFocus();
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
-    connect(ui->entityName, SIGNAL(textChanged(QString)), this, SLOT(ValidateInput()));
-    connect(ui->categoryName, SIGNAL(textChanged(QString)), this, SLOT(ValidateInput()));
-
-    SetCategoryCompleterPath((Path::GetEditingGameDataFolder() + "/Scripts/Entities").c_str());
-    SetNameValidatorPath((Path::GetEditingGameDataFolder() + "/Entities").c_str());
-}
-
-NewEntityDialog::~NewEntityDialog()
-{
-    SAFE_DELETE(entityNameValidator);
-    SAFE_DELETE(folderNameCompleter);
-    delete ui;
-}
-
-void NewEntityDialog::SetCategoryCompleterPath(CryStringT<char> path)
-{
-    SAFE_DELETE(folderNameCompleter);
-
-    QDirIterator directoryIt(QString::fromLocal8Bit(path.c_str(), path.length()), QDir::NoDotAndDotDot | QDir::AllDirs, QDirIterator::Subdirectories);
-    baseDir = directoryIt.path() + "/";
-
-    QStringList dirs;
-    while (directoryIt.hasNext())
-    {
-        QString dir = directoryIt.next().remove(baseDir);
-        dirs.append(dir);
-    }
-
-    folderNameCompleter = new QCompleter(dirs);
-    folderNameCompleter->setCompletionMode(QCompleter::UnfilteredPopupCompletion);
-    folderNameCompleter->setCaseSensitivity(Qt::CaseInsensitive);
-    ui->categoryName->setCompleter(folderNameCompleter);
-}
-
-void NewEntityDialog::SetNameValidatorPath(CryStringT<char> path)
-{
-    QDir dir(QString::fromLocal8Bit(path.c_str(), path.length()));
-    nameBaseDir = dir.path() + "/";
-}
-
-void NewEntityDialog::ValidateInput()
-{
-    int cursorPos = ui->entityName->cursorPosition();
-    QString text = ui->entityName->text();
-    bool validText = entityNameValidator->validate(text, cursorPos);
-    ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(validText);
-}
-
-void NewEntityDialog::accept()
-{
-    if (ui->categoryName->text().isEmpty()
-        && QMessageBox::question(this, "Are you sure?", "Create entity without category?", QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes)
-    {
-        return;
-    }
-    const char* devRoot = gEnv->pFileIO->GetAlias("@engroot@");
-    QString devRootPath(devRoot);
-    QFile entTemplateFile(devRootPath + "/Editor/NewEntityTemplate.ent_template");
-    QFile luaTemplateFile(devRootPath + "/Editor/NewEntityTemplate.lua_template");
-    QFile entDestFile(nameBaseDir + ui->entityName->text() + ".ent");
-    QFile luaDestFile(baseDir + ui->categoryName->text() + "/" + ui->entityName->text() + ".lua");
-
-    if (!entTemplateFile.exists() || !luaTemplateFile.exists())
-    {
-        QMessageBox::critical(this, tr("Missing Template Files"), tr("In order to create default entities the NewEntityTemplate.lua and NewEntityTemplate.ent template files must exist in the Templates folder!"));
-        return;
-    }
-
-    //generate the .ent file
-    QDir pathMaker(nameBaseDir);
-    pathMaker.mkpath(pathMaker.path());
-    QString entFileString;
-    if (!entTemplateFile.open(QIODevice::ReadOnly | QIODevice::Text))
-    {
-        AZ_Warning("Editor", false, "Enable to open template file for ent : %s", entTemplateFile.fileName().toUtf8().constData());
-        return;
-    }
-    else
-    {
-        entFileString = entTemplateFile.readAll();
-        entTemplateFile.close();
-    }
-
-    entFileString.replace(QString("[CATEGORY_NAME]"), ui->categoryName->text());
-    entFileString.replace(QString("[ENTITY_NAME]"), ui->entityName->text());
-    if (!entDestFile.open(QIODevice::WriteOnly | QIODevice::Text))
-    {
-        AZ_Warning("Editor", false, "Enable to open destination file for ent : %s", entDestFile.fileName().toUtf8().constData());
-        return;
-    }
-    else
-    {
-        entDestFile.write(entFileString.toUtf8());
-        entDestFile.close();
-    }
-
-    //generate the .lua file
-    pathMaker.setPath(baseDir);
-    pathMaker.mkpath(ui->categoryName->text() + "/");
-
-    QString luaFileString;
-    if (!luaTemplateFile.open(QIODevice::ReadOnly | QIODevice::Text))
-    {
-        AZ_Warning("Editor", false, "Enable to open template file for lua : %s", luaTemplateFile.fileName().toUtf8().constData());
-        return;
-    }
-    else
-    {
-        luaFileString = luaTemplateFile.readAll();
-        luaTemplateFile.close();
-    }
-
-    luaFileString.replace(QString("[ENTITY_NAME]"), ui->entityName->text());
-    if (!luaDestFile.open(QIODevice::WriteOnly | QIODevice::Text))
-    {
-        AZ_Warning("Editor", false, "Enable to open destination file for lua : %s", luaDestFile.fileName().toUtf8().constData());
-        return;
-    }
-    else
-    {
-        luaDestFile.write(luaFileString.toUtf8());
-        luaDestFile.close();
-    }
-
-
-    if (ui->openLuaCB->isChecked())
-    {
-        CFileUtil::EditTextFile(luaDestFile.fileName().toLocal8Bit().data());
-    }
-
-    QDialog::accept();
-}
-
-QValidator::State NewEntityDialog::EntityNameValidator::validate(QString& input, [[maybe_unused]] int& pos) const
-{
-    if (!m_Parent)
-    {
-        return Invalid;
-    }
-
-    if (input.isEmpty())
-    {
-        return Invalid;
-    }
-
-    if (input.contains("/"))
-    {
-        return Invalid;
-    }
-
-    QString fileBaseName = m_Parent->ui->entityName->text();
-
-    // Characters
-    const char* notAllowedChars = ",^@=+{}[]~!?:&*\"|#%<>$\"'();`' ";
-    for (const char* c = notAllowedChars; *c; c++)
-    {
-        if (fileBaseName.contains(QLatin1Char(*c)))
-        {
-            const QChar qc = QLatin1Char(*c);
-            if (qc.isSpace())
-            {
-                QToolTip::showText(m_Parent->ui->entityName->mapToGlobal(QPoint()), tr("Name may not contain white space."), m_Parent->ui->entityName, m_Parent->ui->entityName->rect(), 2000);
-            }
-            else
-            {
-                QToolTip::showText(m_Parent->ui->entityName->mapToGlobal(QPoint()), tr("Invalid character \"%1\".").arg(qc), m_Parent->ui->entityName, m_Parent->ui->entityName->rect(), 2000);
-            }
-            return Invalid;
-        }
-    }
-
-    QString filename(m_Parent->nameBaseDir + m_Parent->ui->entityName->text() + ".ent");
-    QFile newFile(filename);
-
-    if (newFile.exists())
-    {
-        QToolTip::showText(m_Parent->ui->entityName->mapToGlobal(QPoint()), tr("Filename already exists!"), m_Parent->ui->entityName, m_Parent->ui->entityName->rect(), 2000);
-        return Invalid;
-    }
-
-    return Acceptable;
-}
-
-#include <Dialogs/QT/moc_NewEntityDialog.cpp>

Code/Sandbox/Editor/Dialogs/QT/NewEntityDialog.h

@@ -1,69 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-#ifndef NEWENTITYDIALOG_H
-#define NEWENTITYDIALOG_H
-
-#if !defined(Q_MOC_RUN)
-#include <QDialog>
-#include <QCompleter>
-#include <QDirIterator>
-#include <QStringListModel>
-#include <QValidator>
-#include <QEvent>
-#include <QLineEdit>
-#endif
-
-namespace Ui {
-    class NewEntityDialog;
-}
-
-class NewEntityDialog
-    : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit NewEntityDialog(QWidget* parent = 0);
-    ~NewEntityDialog();
-
-private:
-    Ui::NewEntityDialog* ui;
-    QString baseDir = "";
-    QString nameBaseDir = "";
-    QCompleter* folderNameCompleter = NULL;
-
-    void SetCategoryCompleterPath(CryStringT<char> path);
-    void SetNameValidatorPath(CryStringT<char> path);
-
-    virtual void accept();
-
-    class EntityNameValidator
-        : public QValidator
-    {
-    public:
-        explicit EntityNameValidator(NewEntityDialog* parent = 0)
-            : QValidator(parent)
-            , m_Parent(parent)
-        {
-        }
-        virtual State validate(QString& input, int& pos) const;
-
-        NewEntityDialog* m_Parent;
-    };
-
-    EntityNameValidator* entityNameValidator;
-
-public slots:
-    void ValidateInput();
-};
-
-#endif // NEWENTITYDIALOG_H

Code/Sandbox/Editor/Dialogs/QT/NewEntityDialog.ui

@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>NewEntityDialog</class>
- <widget class="QDialog" name="NewEntityDialog">
-  <property name="windowModality">
-   <enum>Qt::WindowModal</enum>
-  </property>
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>111</height>
-   </rect>
-  </property>
-  <property name="contextMenuPolicy">
-   <enum>Qt::PreventContextMenu</enum>
-  </property>
-  <property name="windowTitle">
-   <string>New Entity</string>
-  </property>
-  <property name="sizeGripEnabled">
-   <bool>false</bool>
-  </property>
-  <property name="modal">
-   <bool>false</bool>
-  </property>
-  <widget class="QDialogButtonBox" name="buttonBox">
-   <property name="geometry">
-    <rect>
-     <x>30</x>
-     <y>70</y>
-     <width>341</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-   <property name="standardButtons">
-    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="entityName">
-   <property name="geometry">
-    <rect>
-     <x>110</x>
-     <y>10</y>
-     <width>281</width>
-     <height>20</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>71</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <weight>75</weight>
-     <bold>true</bold>
-    </font>
-   </property>
-   <property name="text">
-    <string>Entity Name:</string>
-   </property>
-   <property name="buddy">
-    <cstring>entityName</cstring>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_2">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>40</y>
-     <width>91</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <weight>75</weight>
-     <bold>true</bold>
-    </font>
-   </property>
-   <property name="text">
-    <string>Entity Category:</string>
-   </property>
-   <property name="buddy">
-    <cstring>categoryName</cstring>
-   </property>
-  </widget>
-  <widget class="QLineEdit" name="categoryName">
-   <property name="geometry">
-    <rect>
-     <x>110</x>
-     <y>40</y>
-     <width>281</width>
-     <height>20</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="openLuaCB">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>80</y>
-     <width>141</width>
-     <height>17</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Open Lua After Creating</string>
-   </property>
-  </widget>
- </widget>
- <tabstops>
-  <tabstop>entityName</tabstop>
-  <tabstop>categoryName</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>NewEntityDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>NewEntityDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

Code/Sandbox/Editor/EditorPanelUtils.cpp

@@ -16,6 +16,8 @@
 
 #include "EditorPanelUtils.h"
 
+#include <AzCore/Utils/Utils.h>
+
 // Qt
 #include <QInputDialog>
 #include <QFileDialog>
@@ -147,7 +149,8 @@ public:
 
     virtual void HotKey_Export() override
     {
-        QString filepath = QFileDialog::getSaveFileName(nullptr, "Select shortcut configuration to load", "Editor/Plugins/ParticleEditorPlugin/settings", "HotKey Config Files (*.hkxml)");
+        auto settingDir = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Editor" / "Plugins" / "ParticleEditorPlugin" / "settings";
+        QString filepath = QFileDialog::getSaveFileName(nullptr, "Select shortcut configuration to load", settingDir.c_str(), "HotKey Config Files (*.hkxml)");
         QFile file(filepath);
         if (!file.open(QIODevice::WriteOnly))
         {

Code/Sandbox/Editor/EditorViewportWidget.cpp

@@ -230,9 +230,6 @@ EditorViewportWidget::~EditorViewportWidget()
 //////////////////////////////////////////////////////////////////////////
 int EditorViewportWidget::OnCreate()
 {
-    m_renderer = GetIEditor()->GetRenderer();
-    m_engine = GetIEditor()->Get3DEngine();
-
     CreateRenderContext();
 
     return 0;
@@ -426,7 +423,7 @@ void EditorViewportWidget::Update()
         return;
     }
 
-    if (!m_engine || m_rcClient.isEmpty() || GetIEditor()->IsInMatEditMode())
+    if (m_rcClient.isEmpty() || GetIEditor()->IsInMatEditMode())
     {
         return;
     }
@@ -796,10 +793,6 @@ void EditorViewportWidget::OnRender()
         {
             GetIEditor()->GetRenderer()->SetCamera(gEnv->pSystem->GetViewCamera());
         }
-        if (m_engine)
-        {
-            m_engine->RenderWorld(0, SRenderingPassInfo::CreateGeneralPassRenderingInfo(m_Camera), __FUNCTION__);
-        }
         return;
     }
 
@@ -1814,11 +1807,6 @@ void EditorViewportWidget::SetViewTM(const Matrix34& viewTM, bool bMoveOnly)
 //////////////////////////////////////////////////////////////////////////
 void EditorViewportWidget::RenderSelectedRegion()
 {
-    if (!m_engine)
-    {
-        return;
-    }
-
     AABB box;
     GetIEditor()->GetSelectedRegion(box);
     if (box.IsEmpty())

Code/Sandbox/Editor/EditorViewportWidget.h

@@ -395,9 +395,6 @@ protected:
     };
     void ResetToViewSourceType(const ViewSourceType& viewSourType);
 
-    //! Assigned renderer.
-    IRenderer*  m_renderer = nullptr;
-    I3DEngine*  m_engine = nullptr;
     bool m_bRenderContextCreated = false;
     bool m_bInRotateMode = false;
     bool m_bInMoveMode = false;

Code/Sandbox/Editor/IconManager.cpp

@@ -27,27 +27,27 @@
 #include "Util/ImageUtil.h"
 
 
-#define HELPER_MATERIAL "Editor/Objects/Helper"
+#define HELPER_MATERIAL "Objects/Helper"
 
 namespace
 {
     // Object names in this array must correspond to EObject enumeration.
     const char* g_ObjectNames[eStatObject_COUNT] =
     {
-        "Editor/Objects/Arrow.cgf",
-        "Editor/Objects/Axis.cgf",
-        "Editor/Objects/Sphere.cgf",
-        "Editor/Objects/Anchor.cgf",
-        "Editor/Objects/entrypoint.cgf",
-        "Editor/Objects/hidepoint.cgf",
-        "Editor/Objects/hidepoint_sec.cgf",
-        "Editor/Objects/reinforcement_point.cgf",
+        "Objects/Arrow.cgf",
+        "Objects/Axis.cgf",
+        "Objects/Sphere.cgf",
+        "Objects/Anchor.cgf",
+        "Objects/entrypoint.cgf",
+        "Objects/hidepoint.cgf",
+        "Objects/hidepoint_sec.cgf",
+        "Objects/reinforcement_point.cgf",
     };
 
     const char* g_IconNames[eIcon_COUNT] =
     {
-        "Editor/Icons/ScaleWarning.png",
-        "Editor/Icons/RotationWarning.png",
+        "Icons/ScaleWarning.png",
+        "Icons/RotationWarning.png",
     };
 };
 

Code/Sandbox/Editor/Include/IResourceSelectorHost.h

@@ -26,7 +26,7 @@
 //     ...
 //     return previousValue;
 //   }
-//   REGISTER_RESOURCE_SELECTOR("Sound", SoundFileSelector, "Editor/icons/sound_16x16.png")
+//   REGISTER_RESOURCE_SELECTOR("Sound", SoundFileSelector, "Icons/sound_16x16.png")
 //
 // To expose it to serialization:
 //

Code/Sandbox/Editor/LensFlareEditor/LensFlareManager.cpp

@@ -228,7 +228,7 @@ AzToolsFramework::AssetBrowser::SourceFileDetails CLensFlareManager::GetSourceFi
 {
     if (IsLensFlareLibraryXML(fullSourceFileName))
     {
-        return AzToolsFramework::AssetBrowser::SourceFileDetails("Editor/Icons/AssetBrowser/LensFlare_16.png");
+        return AzToolsFramework::AssetBrowser::SourceFileDetails("Icons/AssetBrowser/LensFlare_16.png");
     }
     return AzToolsFramework::AssetBrowser::SourceFileDetails();
 }

Code/Sandbox/Editor/MatEditPreviewDlg.cpp

@@ -96,25 +96,25 @@ void CMatEditPreviewDlg::SetupMenuBar()
 //////////////////////////////////////////////////////////////////////////
 void CMatEditPreviewDlg::OnPreviewSphere()
 {
-    m_previewCtrl->LoadModelFile("Editor/Objects/MtlSphere.cgf");
+    m_previewCtrl->LoadModelFile("Objects/MtlSphere.cgf");
 }
 
 //////////////////////////////////////////////////////////////////////////
 void CMatEditPreviewDlg::OnPreviewBox()
 {
-    m_previewCtrl->LoadModelFile("Editor/Objects/MtlBox.cgf");
+    m_previewCtrl->LoadModelFile("Objects/MtlBox.cgf");
 }
 
 //////////////////////////////////////////////////////////////////////////
 void CMatEditPreviewDlg::OnPreviewTeapot()
 {
-    m_previewCtrl->LoadModelFile("Editor/Objects/MtlTeapot.cgf");
+    m_previewCtrl->LoadModelFile("Objects/MtlTeapot.cgf");
 }
 
 //////////////////////////////////////////////////////////////////////////
 void CMatEditPreviewDlg::OnPreviewPlane()
 {
-    m_previewCtrl->LoadModelFile("Editor/Objects/MtlPlane.cgf");
+    m_previewCtrl->LoadModelFile("Objects/MtlPlane.cgf");
 }
 
 //////////////////////////////////////////////////////////////////////////

Code/Sandbox/Editor/Material/MaterialImageListCtrl.cpp

@@ -25,26 +25,26 @@
 #include "MaterialBrowser.h"
 #include "Util/Image.h"
 
-#define ME_BG_TEXTURE "Editor/Materials/Stripes.dds"
+#define ME_BG_TEXTURE "Materials/Stripes.dds"
 
 
-#define MATERIAL_EDITOR_SPHERE_MODEL_FILE "Editor/Objects/MtlSphere.cgf"
+#define MATERIAL_EDITOR_SPHERE_MODEL_FILE "Objects/MtlSphere.cgf"
 #define MATERIAL_EDITOR_SPHERE_CAMERA_RADIUS 1.6f
 #define MATERIAL_EDITOR_SPHERE_CAMERA_FROM_DIRECTION Vec3(0.1f, -1.0f, -0.1f)
 
-#define MATERIAL_EDITOR_BOX_MODEL_FILE "Editor/Objects/MtlBox.cgf"
+#define MATERIAL_EDITOR_BOX_MODEL_FILE "Objects/MtlBox.cgf"
 #define MATERIAL_EDITOR_BOX_CAMERA_RADIUS 2.0f
 #define MATERIAL_EDITOR_BOX_CAMERA_FROM_DIRECTION Vec3(0.75f, -0.75f, -0.5f)
 
-#define MATERIAL_EDITOR_TEAPOT_MODEL_FILE "Editor/Objects/MtlTeapot.cgf"
+#define MATERIAL_EDITOR_TEAPOT_MODEL_FILE "Objects/MtlTeapot.cgf"
 #define MATERIAL_EDITOR_TEAPOT_CAMERA_RADIUS 1.6f
 #define MATERIAL_EDITOR_TEAPOT_CAMERA_FROM_DIRECTION Vec3(0.1f, -0.75f, -0.25f)
 
-#define MATERIAL_EDITOR_PLANE_MODEL_FILE "Editor/Objects/MtlPlane.cgf"
+#define MATERIAL_EDITOR_PLANE_MODEL_FILE "Objects/MtlPlane.cgf"
 #define MATERIAL_EDITOR_PLANE_CAMERA_RADIUS 1.6f
 #define MATERIAL_EDITOR_PLANE_CAMERA_FROM_DIRECTION Vec3(-0.5f, 0.5f, -0.5f)
 
-#define MATERIAL_EDITOR_SWATCH_MODEL_FILE "Editor/Objects/MtlSwatch.cgf"
+#define MATERIAL_EDITOR_SWATCH_MODEL_FILE "Objects/MtlSwatch.cgf"
 #define MATERIAL_EDITOR_SWATCH_CAMERA_RADIUS 1.0f
 #define MATERIAL_EDITOR_SWATCH_CAMERA_FROM_DIRECTION Vec3(0.0f, 0.0f, -1.0f)
 

Code/Sandbox/Editor/PythonEditorFuncs.cpp

@@ -298,7 +298,7 @@ namespace
                 AZ::IO::FixedMaxPathString engineRoot = AZ::Utils::GetEnginePath();
                 QDir engineDir = !engineRoot.empty() ? QDir(QString(engineRoot.c_str())) : QDir::current();
 
-                QString scriptFolder = engineDir.absoluteFilePath("Editor/Scripts/");
+                QString scriptFolder = engineDir.absoluteFilePath("Assets/Editor/Scripts/");
                 Path::ConvertBackSlashToSlash(scriptFolder);
                 path = scriptFolder + pFile;
 
@@ -524,7 +524,7 @@ namespace
                         // for example: Hello
                         return AZStd::make_any<AZStd::string>(stringValue.toUtf8().data());
                     }
-                    else // then it looks like an integer 
+                    else // then it looks like an integer
                     {
                         // for example: 456
                         return AZStd::make_any<AZ::s64>(stringValue.toInt());

Code/Sandbox/Editor/Resource.h

@@ -149,8 +149,6 @@
 #define ID_OBJECTMODIFY_UNFREEZE                   33518
 #define ID_UNDO                                    33524
 #define ID_EDIT_CLONE                              33525
-#define ID_SELECTION_SAVE                          33527
-#define ID_SELECTION_LOAD                          33529
 #define ID_GOTO_SELECTED                           33535
 #define ID_EDIT_LEVELDATA                          33542
 #define ID_FILE_EDITEDITORINI                      33543

Code/Sandbox/Editor/Settings.cpp

@@ -196,7 +196,6 @@ SEditorSettings::SEditorSettings()
     enableSceneInspector = false;
 
     strStandardTempDirectory = "Temp";
-    strEditorEnv = "Editor/Editor.env";
 
     // Init source safe params.
     enableSourceControl = true;
@@ -532,7 +531,6 @@ void SEditorSettings::Save()
     SaveValue("Settings", "editorConfigSpec", editorConfigSpec);
 
     SaveValue("Settings", "TemporaryDirectory", strStandardTempDirectory);
-    SaveValue("Settings", "EditorEnv", strEditorEnv);
 
     SaveValue("Settings", "ConsoleBackgroundColorThemeV2", (int)consoleBackgroundColorTheme);
 
@@ -747,7 +745,6 @@ void SEditorSettings::Load()
 
 
     LoadValue("Settings", "TemporaryDirectory", strStandardTempDirectory);
-    LoadValue("Settings", "EditorEnv", strEditorEnv);
 
     int consoleBackgroundColorThemeInt = (int)consoleBackgroundColorTheme;
     LoadValue("Settings", "ConsoleBackgroundColorThemeV2", consoleBackgroundColorThemeInt);
@@ -760,7 +757,7 @@ void SEditorSettings::Load()
     LoadValue("Settings", "ShowTimeInConsole", bShowTimeInConsole);
 
     LoadValue("Settings", "EnableSceneInspector", enableSceneInspector);
-    
+
     //////////////////////////////////////////////////////////////////////////
     // Viewport Settings.
     //////////////////////////////////////////////////////////////////////////

Code/Sandbox/Editor/Settings.h

@@ -419,7 +419,6 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
 
     // This directory is related to the editor root.
     QString strStandardTempDirectory;
-    QString strEditorEnv;
 
     SGUI_Settings gui;
 

Code/Sandbox/Editor/SettingsManager.cpp

@@ -25,7 +25,7 @@
 #include "QtViewPaneManager.h"
 
 
-#define TOOLBOX_FILE "Editor/ToolBox.xml"
+#define TOOLBOX_FILE "ToolBox.xml"
 #define TOOLBOX_NODE "ToolBox"
 
 CSettingsManager::CSettingsManager(EditorSettingsManagerType managerType)

Code/Sandbox/Editor/SettingsManager.h

@@ -19,8 +19,8 @@
 
 class QByteArray;
 
-#define EDITOR_LAYOUT_FILE_PATH "@engroot@/Editor/EditorLayout.xml"
-#define EDITOR_SETTINGS_FILE_PATH "@engroot@/Editor/EditorSettings.xml"
+#define EDITOR_LAYOUT_FILE_PATH "@user@/Editor/EditorLayout.xml"
+#define EDITOR_SETTINGS_FILE_PATH "@user@/Editor/EditorSettings.xml"
 #define EDITOR_LAYOUT_ROOT_NODE "EditorLayout"
 #define EDITOR_SETTINGS_ROOT_NODE "EditorSettings"
 #define EDITOR_SETTINGS_CONTENT_NODE "EditorSettingsContent"
@@ -30,7 +30,7 @@ class QByteArray;
 #define CVARS_NODE "CVars"
 #define CVAR_NODE "CVar"
 
-#define EDITOR_EVENT_LOG_FILE_PATH "@engroot@/Editor/EditorEventLog.xml"
+#define EDITOR_EVENT_LOG_FILE_PATH "@user@/Editor/EditorEventLog.xml"
 #define EDITOR_EVENT_LOG_ROOT_NODE "EventRecorder"
 #define EVENT_LOG_EVENT_NAME "eventName"
 #define EDITOR_EVENT_LOG_ATTRIB_NAME "value"

Code/Sandbox/Editor/ShaderEnum.cpp

@@ -71,7 +71,7 @@ int CShaderEnum::EnumShaders()
         m_shaders.push_back(sd);
     }
 
-    XmlNodeRef root = GetISystem()->GetXmlUtils()->LoadXmlFromFile("Editor/Materials/ShaderList.xml");
+    XmlNodeRef root = GetISystem()->GetXmlUtils()->LoadXmlFromFile("Materials/ShaderList.xml");
     if (root)
     {
         for (int i = 0; i < root->getChildCount(); ++i)

Code/Sandbox/Editor/Style/CloudCanvas.qss

@@ -1,488 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#ResourceManagement QLabel
-{
-    /* 
-        This sets the indent Q_PROPERTY on QLabel to 0. The default value is -1,
-        which triggers some computation based on the font size. But that only 
-        happens under some cicumstances, such as when using a stylesheet to set
-        margins or padding on the QLabel. Adding such styling suddenly causes
-        the indent to be applied, causing the left alignment of the text to break.
-    */
-    qproperty-indent: 0
-}
-
-#ResourceManagement #TreeTitle
-{
-    font-size: 12px; 
-    font-weight: bold;
-}
-
-#ResourceManagement #ButtonBar {
-    margin-top: 6px;
-}
-
-#ResourceManagement #ButtonBar QPushButton {
-    padding: 6px 9px 6px 9px;
-    margin-right: 6px;
-}
-
-#ResourceManagement #Message, #ResourceManagement *[class='Message'] {
-    font-size: 12px;
-    margin-top: 6;
-}
-
-#ResourceManagement #Title {
-    font-size: 14px;
-    font-weight: bold;
-}
-
-#ResourceManagement #Refreshing {
-    color: #F0C32D;
-}
-
-#ResourceManagement #LinkButton, #ResourceManagement *[class='Link'] {
-    border: none;
-    color: #00A1C9;
-    margin-top: 6px;
-    font-weight: bold;
-}
-
-#ResourceManagement QHeaderView::section {
-    color: #999999;
-    font-weight: bold;
-    border: none;
-    padding-top: 0px;
-    padding-bottom: 3px;
-    padding-right: 3px;
-    padding-left: 3px;
-}
-
-#ResourceManagement #Table {
-    qproperty-showGrid: false;
-    border: none;
-}
-
-#ResourceManagement #Table::item {
-    padding-right: 12px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-}
-
-#ResourceManagement #TextContentHelp
-{
-    margin: 0px;
-    padding: 12px;
-    border-style: outset;
-    border-width: 1px;
-    border-color: #303030;
-}
-
-#ResourceManagement #TextContentEdit
-{
-}
-
-#ResourceManagement #TextContentFooter
-{
-    padding: 6px 12px 6px 12px;
-    border-style: outset;
-    border-width: 1px;
-    border-color: #303030;
-}
-
-#ResourceManagement #TextContentFooter QLabel
-{
-    min-width: 48px;
-    max-width: 48px;
-    margin-right: 12px;
-    color: #999999;
-}
-
-#ResourceManagement #TextContentFooter QPushButton
-{
-    padding: 6px 9px 6px 9px;
-    margin-left: 6px;
-}
-
-
-#ResourceManagement #Action {
-    padding: 12px;
-    background-color: #404040;
-}
-
-#ResourceManagement #Action #ButtonBar {
-    background-color: #404040;
-}
-
-#ResourceManagement #Action #Heading {
-    background-color: #404040;
-}
-
-#ResourceManagement #Heading #RefreshButton {
-    margin-left: 12px;
-    padding: 3px;
-}
-
-#ResourceManagement #Action #Heading #Title {
-    border: 0px solid #404040;
-}
-
-#ResourceManagement #Action #Heading #Message {
-    border: 0px solid #404040;
-}
-
-#ResourceManagement #Action #LearnMore {
-    background-color: #404040;
-}
-
-#ResourceManagement #Action #LearnMore #Title {
-    font-size: 12px;
-    margin-top: 24px;
-    font-weight:bold;
-}
-
-#ResourceManagement #Action #LearnMore #LinkButton {
-    background-color: #404040;
-}
-
-#ResourceManagement #Action #Title, #ResourceManagement #Action #Message {
-    background-color: #404040;
-}
-
-#ResourceManagement #Top {
-    padding: 12px; 
-    border-style: outset;
-    border-width: 1px;
-    border-color: #303030;
-}
-
-#ResourceManagement #Bottom {
-    background-color: #404040;
-    padding: 12px; 
-}
-
-#ResourceManagement #Bottom #Title {
-    background-color: #404040;
-    font-size: 12px;
-    font-weight: bold;
-}
-
-#ResourceManagement #Bottom #Message {
-    background-color: #404040;
-    margin-bottom: 6px;
-}
-
-#ResourceManagement #Bottom #Table {
-    background-color: #404040;
-    qproperty-alternatingRowColors: true;
-}
-
-#ResourceManagement #Bottom #Table QHeaderView {
-    background-color: #404040;
-}
-
-#ResourceManagement #Bottom #Table QHeaderView::section {
-    background-color: #404040;
-}
-
-#ResourceManagement #Bottom #Table::item {
-    background-color: #393a3c;
-}
-
-#ResourceManagement #Bottom #Table::item:alternate {
-    background-color: #303030;
-}
-
-#ResourceManagement #Bottom #Resources {
-    background-color: #404040;
-}
-
-#ResourceManagement #Bottom #Refreshing {
-    background-color: #404040;
-}
-
-#ResourceManagement #Stack #Heading #Message
-{
-    margin-top: 0;
-}
-
-#ResourceManagement #Stack #Status #Title
-{
-    font-size: 12px;
-    font-weight: bold;
-    margin-top: 6px;
-    margin-bottom: 6px;
-}
-
-#ResourceManagement #StackEvents #TitleBar {	
-    color: #CCCCCC;
-	background-color: #393a3c;
-    border-style: outset;
-    border-width: 1px;
-    border-color: #303030;
-}
-
-#ResourceManagement #StackEvents #TitleBar * {
-    font-size:12px; 
-} 
-
-#ResourceManagement #StackEvents #TitleBar #Title {
-    font-weight:bold;
-    margin-right: 12px;
-} 
-
-#ResourceManagement #StackEvents #TitleBar #InProgress #Text {
-    color: #F0C32D;
-}
-
-#ResourceManagement #StackEvents #TitleBar #Succeeded {
-    color: #43d96a;
-}
-
-#ResourceManagement #StackEvents #TitleBar #Failed {
-    color: #f44642;
-}
-
-#ResourceManagement #StackEvents #Content {	
-    border-style: inset;
-    border-width: 1px;
-    border-color: #303030;
-    padding: 12px;
-}
-
-#ResourceManagement #StackEvents #Table {
-    qproperty-alternatingRowColors: true;
-    qproperty-showGrid: false;
-}
-
-#ResourceManagement #StackEvents QTableView::item {
-    background-color: #303030;
-}
-
-#ResourceManagement #StackEvents QTableView::item:focus {
-    selection-color: #FFFFFF;
-    selection-background-color: rgba(255, 153, 0, 128);
-}
-
-#ResourceManagement #StackEvents QTableView::item:alternate {
-    background-color: #393a3c;
-}
-
-#ResourceManagement #CreateDeployment #LearnMore
-{
-    margin-bottom: 12px;
-}
-
-#ResourceManagement #CreateDeployment #WarningMessage
-{
-    margin-top: 12px;
-    margin-bottom: 12px;
-}
-
-#ResourceManagement #LoadingError, #ResourceManagement #LoadingError #Title, #ResourceManagement #LoadingError #Message, #ResourceManagement #LoadingError #ErrorText
-{
-    background: #404040;
-}
-
-#ResourceManagement #LoadingError #ErrorText
-{
-    padding: 12px;
-    color: #f44642;
-}
-
-#ResourceManagement #Loading, #ResourceManagement #Loading #Title, #ResourceManagement #Loading #Message
-{
-    background: #404040;
-}
-
-#ResourceManagement #Loading, #ResourceManagement #LoadingError
-{
-    padding: 12px;
-}
-
-#ResourceManagement #MainToolbar
-{
-    padding: 6px;
-    border-style: inset;
-    border-width: 1px;
-    border-color: #303030;
-}
-
-#ResourceManagement #MainToolbar QPushButton
-{
-    border: none;
-    padding: 0px;
-}
-
-#ResourceManagement #MainToolbar #AddNewButton
-{
-    margin-left: 12px;
-    margin-right: 12px;
-}
-
-#ResourceManagement #ResourceImporter #RegionBox:disabled
-{
-    color: #555555;
-}
-
-#ResourceManagement #ResourceImporter #ListTable
-{
-    qproperty-alternatingRowColors: true;
-    qproperty-showGrid: false;
-    border: none;
-}
-
-#ResourceManagement #ResourceImporter #ListTable::item
-{
-    padding-right: 12px;
-    padding-top: 3px;
-    padding-bottom: 3px;
-    background-color: #333436;
-}
-
-#ResourceManagement #ResourceImporter #ListTable::item:alternate
-{
-    background-color: #303030;
-}
-
-#ResourceManagement #ResourceImporter #SelectionTable
-{
-    qproperty-showGrid: false;
-    border: none;
-    gridline-color: #393a3c;
-}
-
-#ResourceManagement #ResourceImporter #SelectionTable::item
-{
-    padding: 1px 1px 1px 1px;
-
-}
-
-#ResourceManagement #ResourceImporter #LoadingLabel
-{
-    color : #F0C32D;
-}
-
-#ResourceManagement #MainToolbar #SaveButton,
-#ResourceManagement #MainToolbar #DeleteButton,
-#ResourceManagement #MainToolbar #SourceControlButton,
-#ResourceManagement #MainToolbar #AddNewButton
-{
-    qproperty-flat: true;
-}
-
-#ResourceManagement #MainToolbar #CurrentProfile
-{
-    margin-right: 12px;
-}
-
-#ResourceManagement #MainToolbar #CurrentDeployment
-{
-    margin-right: 12px;
-    margin-left: 12px;
-}
-
-#ResourceManagement #UpdateStack #Refreshing
-{
-    margin-top: 12px;
-    margin-left: 12px;
-}
-
-#ResourceManagement #UpdateStack #Message
-{
-    margin-bottom: 6px;
-}
-
-#ResourceManagement #UpdateStack #Table {
-    qproperty-alternatingRowColors: true;
-    qproperty-showGrid: false;
-}
-
-#ResourceManagement #UpdateStack #Table::item {
-    background-color: #303030;
-}
-
-#ResourceManagement #UpdateStack #Table::item:alternate {
-    background-color: #393a3c;
-}
-
-#ResourceManagement #UpdateStack #Status {
-    color: #F0C32D;
-}
-
-#ProfileSelector #DeleteProfile {
-    width: 38px;
-    height: 11px;
-    border: none;
-}
-
-#ProfileSelector #EditSelectedProfile {
-    color: #00A1C9;
-}
-
-#InitializeCloudCanvasProject #Profiles QRadioButton {
-    margin-left: 5px;
-}
-
-#InitializeCloudCanvasProject #ProfileEditButtons  {
-}
-
-#InitializeCloudCanvasProject #ProfileEditButtons QPushButton {
-}
-
-#InitializeCloudCanvasProject #ContentFrame {
-    x-margin: 6px;
-    x-padding: 6px;
-    border: 1px solid rgb(34, 35, 38);
-    x-background-color: purple;
-}
-
-#LoginDialog
-{
-    background-color: #F8F8F8;
-}
-
-#LoginDialog Amazon--LoginWelcomeTitle
-{
-    color: #444444;
-    background-color: #F8F8F8;
-    font-size: 21px;
-    qproperty-alignment: AlignCenter;
-    font-family: "Open Sans Semibold";
-}
-
-#LoginDialog Amazon--LoginWelcomeText
-{
-    color: #444444;
-    background-color: #F8F8F8;
-    font-size: 13px;
-    qproperty-alignment: AlignLeft;
-}
-
-#LoginDialog Amazon--LoginFooterText
-{
-    color: #999999;
-    background-color: #F8F8F8;
-    font-size: 13px;
-    qproperty-alignment: AlignCenter;
-}
-
-#LoginDialog Amazon--LoginWebViewFrame
-{
-    border: 2px solid #EEEEEE;
-}
-
-#LoginDialog Amazon--LoginWebView
-{
-    background-color: #F8F8F8;
-}

Code/Sandbox/Editor/Style/resources.qrc

@@ -1,10 +1,9 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-    <file alias="Editor/Style/Editor.qss">Editor.qss</file>
-    <file alias="Editor/Style/EditorPreferencesDialog.qss">EditorPreferencesDialog.qss</file>
-    <file alias="Editor/Style/CloudCanvas.qss">CloudCanvas.qss</file>
-    <file alias="Editor/Style/LayoutConfigDialog.qss">LayoutConfigDialog.qss</file>
-    <file alias="Editor/Style/GraphicsSettingsDialog.qss">GraphicsSettingsDialog.qss</file>
-    <file alias="Editor/Style/LensFlareEditor.qss">LensFlareEditor.qss</file>
+    <file alias="Assets/Editor/Style/Editor.qss">Editor.qss</file>
+    <file alias="Assets/Editor/Style/EditorPreferencesDialog.qss">EditorPreferencesDialog.qss</file>
+    <file alias="Assets/Editor/Style/LayoutConfigDialog.qss">LayoutConfigDialog.qss</file>
+    <file alias="Assets/Editor/Style/GraphicsSettingsDialog.qss">GraphicsSettingsDialog.qss</file>
+    <file alias="Assets/Editor/Style/LensFlareEditor.qss">LensFlareEditor.qss</file>
 </qresource>
 </RCC>

Code/Sandbox/Editor/TimeOfDayDialog.cpp

@@ -1088,7 +1088,7 @@ void CTimeOfDayDialog::OnResetToDefaultValues()
         ITimeOfDay* pTimeOfDay = gEnv->p3DEngine->GetTimeOfDay();
 
         // Load the default time of day settings and use those to reset the time of day.
-        XmlNodeRef root = GetISystem()->LoadXmlFromFile("Editor/default_time_of_day.xml");
+        XmlNodeRef root = GetISystem()->LoadXmlFromFile("default_time_of_day.xml");
         if (root)
         {
             pTimeOfDay->Serialize(root, true);

Code/Sandbox/Editor/ToolBox.cpp

@@ -335,21 +335,9 @@ void CToolBoxManager::Load(ActionManager* actionManager)
 
     if (actionManager)
     {
-        QByteArray array = gSettings.strEditorEnv.toUtf8();
-        AZStd::string actualPath = AZStd::string::format("@engroot@/%s", array.constData());
-        XmlNodeRef envNode = XmlHelpers::LoadXmlFromFile(actualPath.c_str());
-        if (envNode)
-        {
-            int childrenCount = envNode->getChildCount();
-            for (int idx = 0; idx < childrenCount; ++idx)
-            {
-                XmlNodeRef child = envNode->getChild(idx);
-                if (child->haveAttr("scriptPath") && child->haveAttr("shelvesPath"))
-                {
-                    LoadShelves(child->getAttr("scriptPath"), child->getAttr("shelvesPath"), actionManager);
-                }
-            }
-        }
+        auto engineSourceAssetPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets";
+        LoadShelves((engineSourceAssetPath / "Editor" / "Scripts").c_str(),
+            (engineSourceAssetPath / "Editor" / "Scripts" / "Shelves").c_str(), actionManager);
     }
 }
 

Code/Sandbox/Editor/ViewPane.cpp

@@ -589,7 +589,7 @@ void CLayoutViewPane::ShowTitleMenu()
     action->setChecked(IsFullscreen());
 
     action = root.addAction(tr("Configure Layout..."));
-    if (AZ::Interface<AzFramework::AtomActiveInterface>::Get())
+    if (!CViewManager::IsMultiViewportEnabled())
     {
         action->setDisabled(true);
     }

Code/Sandbox/Editor/editor_lib_files.cmake

@@ -511,9 +511,6 @@ set(FILES
     DimensionsDialog.cpp
     DimensionsDialog.h
     DimensionsDialog.ui
-    Dialogs/QT/NewEntityDialog.cpp
-    Dialogs/QT/NewEntityDialog.h
-    Dialogs/QT/NewEntityDialog.ui
     NewLevelDialog.cpp
     NewLevelDialog.h
     NewLevelDialog.ui
@@ -551,7 +548,6 @@ set(FILES
     DatabaseFrameWnd.h
     DatabaseFrameWnd.ui
     DatabaseFrameWnd.qrc
-    Dialogs/DuplicatedObjectsHandlerDlg.h
     DocMultiArchive.h
     EditMode/DeepSelection.h
     FBXExporterDialog.h
@@ -711,8 +707,6 @@ set(FILES
     graphicssettingsdialog.ui
     AboutDialog.cpp
     DatabaseFrameWnd.cpp
-    Dialogs/DuplicatedObjectsHandlerDlg.cpp
-    Dialogs/DuplicatedObjectsHandlerDlg.ui
     ErrorReportTableModel.h
     ErrorReportTableModel.cpp
     EditMode/DeepSelection.cpp

Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h

@@ -376,9 +376,9 @@ private:
     // Tracks new entities that have not yet been saved.
     AZStd::unordered_set<AZ::EntityId> m_unsavedEntities;
 
-    const AZStd::string m_defaultComponentIconLocation = "Editor/Icons/Components/Component_Placeholder.svg";
-    const AZStd::string m_defaultComponentViewportIconLocation = "Editor/Icons/Components/Viewport/Component_Placeholder.png";
-    const AZStd::string m_defaultEntityIconLocation = "Editor/Icons/Components/Viewport/Transform.png";
+    const AZStd::string m_defaultComponentIconLocation = "Icons/Components/Component_Placeholder.svg";
+    const AZStd::string m_defaultComponentViewportIconLocation = "Icons/Components/Viewport/Component_Placeholder.png";
+    const AZStd::string m_defaultEntityIconLocation = "Icons/Components/Viewport/Transform.png";
 
     bool m_debugDisplayBusImplementationActive = false;
 

Code/Sandbox/Plugins/ComponentEntityEditorPlugin/UI/ComponentPalette/CategoriesList.cpp

@@ -33,8 +33,8 @@ void ComponentCategoryList::Init()
     headers << tr("Categories");
     setHeaderLabels(headers);
 
-    const QString parentCategoryIconPath = QString("Editor/Icons/PropertyEditor/Browse_on.png");
-    const QString categoryIconPath = QString("Editor/Icons/PropertyEditor/Browse.png");
+    const QString parentCategoryIconPath = QString("Icons/PropertyEditor/Browse_on.png");
+    const QString categoryIconPath = QString("Icons/PropertyEditor/Browse.png");
 
     QTreeWidgetItem* allCategory = new QTreeWidgetItem(this);
     allCategory->setText(0, "All");

Code/Sandbox/Plugins/EditorAssetImporter/AssetBrowserContextProvider.cpp

@@ -94,7 +94,7 @@ namespace AZ
             {
                 if (AzFramework::StringFunc::Equal(extensionString.c_str(), potentialExtension.c_str()))
                 {
-                    return AzToolsFramework::AssetBrowser::SourceFileDetails("Editor/Icons/AssetBrowser/FBX_16.png");
+                    return AzToolsFramework::AssetBrowser::SourceFileDetails("Icons/AssetBrowser/FBX_16.png");
                 }
             }
         }

Code/Sandbox/Plugins/EditorAssetImporter/AssetImporter.qrc

@@ -1,17 +1,17 @@
 <RCC>
     <qresource prefix="/Icons">
-        <file alias="Browse.png">../../../../Editor/Icons/PropertyEditor/Browse.png</file>
-        <file alias="Browse_On.png">../../../../Editor/Icons/PropertyEditor/Browse_on.png</file>
-        <file alias="DeleteRule.png">../../../../Editor/Icons/PropertyEditor/remove.png</file>
-        <file alias="DeleteGroup.png">../../../../Editor/Icons/PropertyEditor/remove.png</file>
-        <file alias="Error.png">../../../../Editor/Icons/PropertyEditor/error_icon.png</file>
-        <file alias="RefreshGroup.png">../../../../Editor/Icons/PropertyEditor/reset_icon.png</file>
-        <file alias="MeshSelectorBrowse.png">../../../../Editor/Icons/AssetImporter/mesh.png</file>
-        <file alias="MeshSelectorBrowse_On.png">../../../../Editor/Icons/AssetImporter/mesh_on.png</file>
-        <file alias="MeshTreeIcon.png">../../../../Editor/Icons/AssetImporter/mesh_on.png</file>
-        <file alias="GroupTreeIcon.png">../../../../Editor/Icons/AssetImporter/group_icon.png</file>
-        <file alias="CheckMark_Checked.png">../../../../Editor/Icons/checkmark_checked.png</file>
-        <file alias="CheckMark_Hover.png">../../../../Editor/Icons/checkmark_checked_hover.png</file>
-        <file alias="CheckMark_Unchecked_Hover.png">../../../../Editor/Icons/checkmark_unchecked_hover.png</file>
+        <file alias="Browse.png">../../../../Assets/Editor/Icons/PropertyEditor/Browse.png</file>
+        <file alias="Browse_On.png">../../../../Assets/Editor/Icons/PropertyEditor/Browse_on.png</file>
+        <file alias="DeleteRule.png">../../../../Assets/Editor/Icons/PropertyEditor/remove.png</file>
+        <file alias="DeleteGroup.png">../../../../Assets/Editor/Icons/PropertyEditor/remove.png</file>
+        <file alias="Error.png">../../../../Assets/Editor/Icons/PropertyEditor/error_icon.png</file>
+        <file alias="RefreshGroup.png">../../../../Assets/Editor/Icons/PropertyEditor/reset_icon.png</file>
+        <file alias="MeshSelectorBrowse.png">../../../../Assets/Editor/Icons/AssetImporter/mesh.png</file>
+        <file alias="MeshSelectorBrowse_On.png">../../../../Assets/Editor/Icons/AssetImporter/mesh_on.png</file>
+        <file alias="MeshTreeIcon.png">../../../../Assets/Editor/Icons/AssetImporter/mesh_on.png</file>
+        <file alias="GroupTreeIcon.png">../../../../Assets/Editor/Icons/AssetImporter/group_icon.png</file>
+        <file alias="CheckMark_Checked.png">../../../../Assets/Editor/Icons/checkmark_checked.png</file>
+        <file alias="CheckMark_Hover.png">../../../../Assets/Editor/Icons/checkmark_checked_hover.png</file>
+        <file alias="CheckMark_Unchecked_Hover.png">../../../../Assets/Editor/Icons/checkmark_unchecked_hover.png</file>
     </qresource>
 </RCC>

Code/Sandbox/Plugins/EditorCommon/DockTitleBarWidget.cpp

@@ -175,7 +175,7 @@ CDockTitleBarWidget::CDockTitleBarWidget(QDockWidget* dockWidget)
     m_layout->addLayout(m_buttonLayout, 0);
 
     m_floatButton = new CDockWidgetTitleButton(dockWidget);
-    m_floatButton->setIcon(QIcon("Editor/Icons/float.png"));
+    m_floatButton->setIcon(QIcon("Icons/float.png"));
     m_floatButton->setVisible(opt.floatable);
     m_floatButton->setToolTip("Toggle Floating");
     connect(m_floatButton, SIGNAL(clicked()), SLOT(OnFloatButtonPressed()));
@@ -185,7 +185,7 @@ CDockTitleBarWidget::CDockTitleBarWidget(QDockWidget* dockWidget)
     // close.png is a standard icon that looks similar to one in Fusion theme but
     // uses alpha so it can be used on dark theme as well.
     // style()->standardIcon(QStyle::SP_TitleBarCloseButton, &opt, dockWidget)
-    QIcon closeIcon("Editor/Icons/close.png");
+    QIcon closeIcon("Icons/close.png");
     m_closeButton->setIcon(closeIcon);
     m_closeButton->setVisible(opt.closable);
     m_closeButton->setToolTip("Close");

Code/Sandbox/Plugins/EditorCommon/QPropertyTree/PropertyRowLocalFrame.cpp

@@ -80,7 +80,7 @@ void PropertyRowLocalFrameBase::reset(QPropertyTree* tree)
 
 void PropertyRowLocalFrameBase::redraw(const PropertyDrawContext& context)
 {
-    static QIcon gizmo("Editor/Icons/animation/gizmo_location.png");
+    static QIcon gizmo("Icons/animation/gizmo_location.png");
     gizmo.paint(context.painter, context.widgetRect.adjusted(1, 1, 1, 1), Qt::AlignRight);
 }
 

Code/Sandbox/Plugins/EditorCommon/QPropertyTree/PropertyRowResourceSelector.cpp

@@ -292,7 +292,7 @@ const QIcon& PropertyRowResourceSelector::buttonIcon(const QPropertyTree* tree,
     }
     case BUTTON_CREATE:
     {
-        static QIcon addIcon("Editor/Icons/animation/add.png");
+        static QIcon addIcon("Icons/animation/add.png");
         ;
         return addIcon;
     }

Code/Tools/AssetBundler/tests/AssetProcessorPlatformConfig.ini

@@ -1,9 +0,0 @@
-[Platforms]
-;pc=enabled
-es3=enabled
-;ios=enabled
-;osx_gl=enabled
-;provo=enabled
-;server=enabled
-
-

Code/Tools/AssetBundler/tests/AssetProcessorPlatformConfig.setreg

@@ -0,0 +1,11 @@
+{
+    "Amazon": {
+        "AssetProcessor": {
+            "Settings": {
+                "Platforms": {
+                    "es3": "enabled"
+                }
+            }
+        }
+    }
+}

Code/Tools/AssetBundler/tests/DummyProject/AssetProcessorGamePlatformConfig.ini

@@ -1,7 +0,0 @@
-[Platforms]
-;pc=enabled
-;es3=enabled
-ios=enabled
-;osx_gl=enabled
-;provo=enabled
-;server=enabled