Merge branch 'development' of https://github.com/o3de/o3de into daimini/Prefabs/FixDuplicateSelection

Signed-off-by: Danilo Aimini <[email protected]>

Author: AMZN-daimini

Code/Editor/EditorPreferencesPageFiles.cpp

@@ -66,7 +66,7 @@ void CEditorPreferencesPage_Files::Reflect(AZ::SerializeContext& serialize)
             ->Attribute(AZ::Edit::Attributes::Min, 1)
             ->Attribute(AZ::Edit::Attributes::Max, 100)
             ->DataElement(AZ::Edit::UIHandlers::LineEdit, &Files::m_standardTempDirectory, "Standard Temporary Directory", "Standard Temporary Directory")
-            ->DataElement(AZ::Edit::UIHandlers::LineEdit, &Files::m_saveLocation, "Slice Save location", "Specify the default location to save new slices");
+            ->DataElement(AZ::Edit::UIHandlers::LineEdit, &Files::m_saveLocation, "UI Slice Save location", "Specify the default location to save new UI slices");
 
         editContext->Class<ExternalEditors>("External Editors", "External Editors")
             ->DataElement(AZ::Edit::UIHandlers::ExeSelectBrowseEdit, &ExternalEditors::m_scripts, "Scripts Editor", "Scripts Text Editor")

Code/Editor/EditorPreferencesPageGeneral.cpp

@@ -47,27 +47,18 @@ void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize)
 
     serialize.Class<Messaging>()
         ->Version(2)
-        ->Field("ShowDashboard", &Messaging::m_showDashboard)
-        ->Field("ShowCircularDependencyError", &Messaging::m_showCircularDependencyError);
+        ->Field("ShowDashboard", &Messaging::m_showDashboard);
 
     serialize.Class<Undo>()
         ->Version(2)
-        ->Field("UndoLevels", &Undo::m_undoLevels)
-        ->Field("UndoSliceOverrideSaves", &Undo::m_undoSliceOverrideSaveValue);
-
-    serialize.Class<SliceSettings>()
-        ->Version(1)
-        ->Field("DynamicByDefault", &SliceSettings::m_slicesDynamicByDefault);
+        ->Field("UndoLevels", &Undo::m_undoLevels);
 
     serialize.Class<CEditorPreferencesPage_General>()
         ->Version(1)
         ->Field("General Settings", &CEditorPreferencesPage_General::m_generalSettings)
         ->Field("Prefab Save Settings", &CEditorPreferencesPage_General::m_levelSaveSettings)
         ->Field("Messaging", &CEditorPreferencesPage_General::m_messaging)
-        ->Field("Undo", &CEditorPreferencesPage_General::m_undo)
-        ->Field("Slice Settings", &CEditorPreferencesPage_General::m_sliceSettings);
-
-
+        ->Field("Undo", &CEditorPreferencesPage_General::m_undo);
 
     AZ::EditContext* editContext = serialize.GetEditContext();
     if (editContext)
@@ -98,26 +89,20 @@ void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize)
                 ->EnumAttribute(AzToolsFramework::Prefab::SaveAllPrefabsPreference::SaveNone, "Save none");
 
         editContext->Class<Messaging>("Messaging", "")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Messaging::m_showDashboard, "Show Welcome to Open 3D Engine at startup", "Show Welcome to Open 3D Engine at startup")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Messaging::m_showCircularDependencyError, "Show Error: Circular dependency", "Show an error message when adding a slice instance to the target slice would create a cyclic asset dependency. All other valid overrides will be saved even if this is turned off.");
+            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Messaging::m_showDashboard, "Show Welcome to Open 3D Engine at startup", "Show Welcome to Open 3D Engine at startup");
 
         editContext->Class<Undo>("Undo", "")
             ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Undo::m_undoLevels, "Undo Levels", "This field specifies the number of undo levels")
             ->Attribute(AZ::Edit::Attributes::Min, 0)
-            ->Attribute(AZ::Edit::Attributes::Max, 10000)
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Undo::m_undoSliceOverrideSaveValue, "Undo Slice Override Saves", "Allow slice saves to be undone");
-
-        editContext->Class<SliceSettings>("Slices", "")
-            ->DataElement(AZ::Edit::UIHandlers::CheckBox, &SliceSettings::m_slicesDynamicByDefault, "New Slices Dynamic By Default", "When creating slices, they will be set to dynamic by default");
+            ->Attribute(AZ::Edit::Attributes::Max, 10000);
 
         editContext->Class<CEditorPreferencesPage_General>("General Editor Preferences", "Class for handling General Editor Preferences")
             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
             ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
             ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_generalSettings, "General Settings", "General Editor Preferences")
             ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_levelSaveSettings, "Prefab Save Settings", "File>Save")
             ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_messaging, "Messaging", "Messaging")
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_undo, "Undo", "Undo Preferences")
-            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_sliceSettings, "Slices", "Slice Settings");
+            ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_undo, "Undo", "Undo Preferences");
     }
 }
 
@@ -147,7 +132,6 @@ void CEditorPreferencesPage_General::OnApply()
     gSettings.consoleBackgroundColorTheme = m_generalSettings.m_consoleBackgroundColorTheme;
     gSettings.bShowTimeInConsole = m_generalSettings.m_bShowTimeInConsole;
     gSettings.bShowDashboardAtStartup = m_messaging.m_showDashboard;
-    gSettings.m_showCircularDependencyError = m_messaging.m_showCircularDependencyError;
     gSettings.bAutoloadLastLevelAtStartup = m_generalSettings.m_autoLoadLastLevel;
     gSettings.stylusMode = m_generalSettings.m_stylusMode;
     gSettings.restoreViewportCamera = m_generalSettings.m_restoreViewportCamera;
@@ -164,11 +148,6 @@ void CEditorPreferencesPage_General::OnApply()
 
     //undo
     gSettings.undoLevels = m_undo.m_undoLevels;
-
-    gSettings.m_undoSliceOverrideSaveValue = m_undo.m_undoSliceOverrideSaveValue;
-
-    //slices
-    gSettings.sliceSettings.dynamicByDefault = m_sliceSettings.m_slicesDynamicByDefault;
 }
 
 void CEditorPreferencesPage_General::InitializeSettings()
@@ -191,12 +170,8 @@ void CEditorPreferencesPage_General::InitializeSettings()
 
     //Messaging
     m_messaging.m_showDashboard = gSettings.bShowDashboardAtStartup;
-    m_messaging.m_showCircularDependencyError = gSettings.m_showCircularDependencyError;
 
     //undo
     m_undo.m_undoLevels = gSettings.undoLevels;
-    m_undo.m_undoSliceOverrideSaveValue = gSettings.m_undoSliceOverrideSaveValue;
 
-    //slices
-    m_sliceSettings.m_slicesDynamicByDefault = gSettings.sliceSettings.dynamicByDefault;
 }

Code/Editor/EditorPreferencesPageGeneral.h

@@ -72,29 +72,19 @@ class CEditorPreferencesPage_General
         AZ_TYPE_INFO(Messaging, "{A6AD87CB-E905-409B-A2BF-C43CDCE63B0C}")
 
         bool m_showDashboard;
-        bool m_showCircularDependencyError;
     };
 
     struct Undo
     {
         AZ_TYPE_INFO(Undo, "{A3AC0728-F132-4BF2-B122-8A631B636E81}")
 
         int m_undoLevels;
-        bool m_undoSliceOverrideSaveValue;
-    };
-
-    struct SliceSettings
-    {
-        AZ_TYPE_INFO(SliceSettings, "{8505CCC1-874C-4389-B51A-B9E5FF70CFDA}")
-
-        bool m_slicesDynamicByDefault;
     };
 
     GeneralSettings m_generalSettings;
     LevelSaveSettings m_levelSaveSettings;
     Messaging m_messaging;
     Undo m_undo;
-    SliceSettings m_sliceSettings;
     QIcon m_icon;
 };
 

Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp

@@ -1297,18 +1297,17 @@ IEditor* SandboxIntegrationManager::GetEditor()
 //////////////////////////////////////////////////////////////////////////
 bool SandboxIntegrationManager::GetUndoSliceOverrideSaveValue()
 {
-    return GetIEditor()->GetEditorSettings()->m_undoSliceOverrideSaveValue;
+    return false;
 }
 
 //////////////////////////////////////////////////////////////////////////
 bool SandboxIntegrationManager::GetShowCircularDependencyError()
 {
-    return GetIEditor()->GetEditorSettings()->m_showCircularDependencyError;
+    return true;
 }
 
-void SandboxIntegrationManager::SetShowCircularDependencyError(const bool& showCircularDependencyError)
+void SandboxIntegrationManager::SetShowCircularDependencyError(const bool& /* showCircularDependencyError */)
 {
-    GetIEditor()->GetEditorSettings()->m_showCircularDependencyError = showCircularDependencyError;
 }
 
 //////////////////////////////////////////////////////////////////////////

Code/Editor/Settings.cpp

@@ -6,7 +6,6 @@
  *
  */
 
-
 #include "EditorDefs.h"
 
 #include "Settings.h"
@@ -24,7 +23,6 @@
 #include <AzCore/StringFunc/StringFunc.h>
 #include <AzCore/Utils/Utils.h>
 
-
 // AzFramework
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
@@ -36,7 +34,6 @@
 #include "CryEdit.h"
 #include "MainWindow.h"
 
-
 //////////////////////////////////////////////////////////////////////////
 // Global Instance of Editor settings.
 //////////////////////////////////////////////////////////////////////////
@@ -107,9 +104,7 @@ SEditorSettings::SEditorSettings()
     bSettingsManagerMode = false;
 
     undoLevels = 50;
-    m_undoSliceOverrideSaveValue = false;
     bShowDashboardAtStartup = true;
-    m_showCircularDependencyError = true;
     bAutoloadLastLevelAtStartup = false;
     bMuteAudio = false;
 
@@ -218,7 +213,6 @@ SEditorSettings::SEditorSettings()
     backgroundUpdatePeriod = 0;
     g_TemporaryLevelName = nullptr;
 
-    sliceSettings.dynamicByDefault = false;
     levelSaveSettings.saveAllPrefabsPreference = AzToolsFramework::Prefab::SaveAllPrefabsPreference::AskEveryTime;
 }
 
@@ -423,9 +417,7 @@ void SEditorSettings::Save(bool isEditorClosing)
 
     // Save settings to registry.
     SaveValue("Settings", "UndoLevels", undoLevels);
-    SaveValue("Settings", "UndoSliceOverrideSaveValue", m_undoSliceOverrideSaveValue);
     SaveValue("Settings", "ShowWelcomeScreenAtStartup", bShowDashboardAtStartup);
-    SaveValue("Settings", "ShowCircularDependencyError", m_showCircularDependencyError);
     SaveValue("Settings", "LoadLastLevelAtStartup", bAutoloadLastLevelAtStartup);
     SaveValue("Settings", "MuteAudio", bMuteAudio);
     SaveValue("Settings", "AutoBackup", autoBackupEnabled);
@@ -563,18 +555,10 @@ void SEditorSettings::Save(bool isEditorClosing)
     SaveValue("Settings\\SmartFileOpen", "DlgRect.Right", smartOpenSettings.rect.right());
     SaveValue("Settings\\SmartFileOpen", "DlgRect.Bottom", smartOpenSettings.rect.bottom());
 
-    //////////////////////////////////////////////////////////////////////////
-    // Slice settings
-    //////////////////////////////////////////////////////////////////////////
-    SaveValue("Settings\\Slices", "DynamicByDefault", sliceSettings.dynamicByDefault);
-
     s_editorSettings()->sync();
 
     // --- Settings Registry values
 
-    // Prefab System UI
-    AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::SetPrefabSystemEnabled, prefabSystem);
-
     AzToolsFramework::Prefab::PrefabLoaderInterface* prefabLoaderInterface =
         AZ::Interface<AzToolsFramework::Prefab::PrefabLoaderInterface>::Get();
     prefabLoaderInterface->SetSaveAllPrefabsPreference(levelSaveSettings.saveAllPrefabsPreference);
@@ -592,12 +576,7 @@ void SEditorSettings::Load()
         AZ::Interface<AzToolsFramework::Prefab::PrefabLoaderInterface>::Get();
     levelSaveSettings.saveAllPrefabsPreference = prefabLoaderInterface->GetSaveAllPrefabsPreference();
 
-    // Load from Settings Registry
-    AzFramework::ApplicationRequests::Bus::BroadcastResult(
-        prefabSystem, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
-
     const int settingsVersion = s_editorSettings()->value(QStringLiteral("Settings/EditorSettingsVersion"), 0).toInt();
-
     if (settingsVersion != EditorSettingsVersion)
     {
         s_editorSettings()->setValue(QStringLiteral("Settings/EditorSettingsVersion"), EditorSettingsVersion);
@@ -608,9 +587,7 @@ void SEditorSettings::Load()
     QString     strPlaceholderString;
     // Load settings from registry.
     LoadValue("Settings", "UndoLevels", undoLevels);
-    LoadValue("Settings", "UndoSliceOverrideSaveValue", m_undoSliceOverrideSaveValue);
     LoadValue("Settings", "ShowWelcomeScreenAtStartup", bShowDashboardAtStartup);
-    LoadValue("Settings", "ShowCircularDependencyError", m_showCircularDependencyError);
     LoadValue("Settings", "LoadLastLevelAtStartup", bAutoloadLastLevelAtStartup);
     LoadValue("Settings", "MuteAudio", bMuteAudio);
     LoadValue("Settings", "AutoBackup", autoBackupEnabled);
@@ -777,11 +754,6 @@ void SEditorSettings::Load()
         smartOpenSettings.rect.setBottom(soRcBottom);
     }
 
-    //////////////////////////////////////////////////////////////////////////
-    // Slice settings
-    //////////////////////////////////////////////////////////////////////////
-    LoadValue("Settings\\Slices", "DynamicByDefault", sliceSettings.dynamicByDefault);
-
     //////////////////////////////////////////////////////////////////////////
     // Load paths.
     //////////////////////////////////////////////////////////////////////////

Code/Editor/Settings.h

@@ -194,11 +194,6 @@ struct SExperimentalFeaturesSettings
 };
 
 //////////////////////////////////////////////////////////////////////////
-struct SSliceSettings
-{
-    bool dynamicByDefault;
-};
-
 struct SLevelSaveSettings
 {
     AzToolsFramework::Prefab::SaveAllPrefabsPreference saveAllPrefabsPreference;
@@ -270,7 +265,7 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
     void ConvertPath(const AZStd::string_view sourcePath, AZStd::string& category, AZStd::string& attribute);
 
     // needs to be called after crysystem has been loaded
-    void    LoadDefaultGamePaths();
+    void LoadDefaultGamePaths();
 
     // need to expose updating of the source control enable/disable flag
     // because its state is updateable through the main status bar
@@ -283,9 +278,7 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
     // Variables.
     //////////////////////////////////////////////////////////////////////////
     int undoLevels;
-    bool m_undoSliceOverrideSaveValue;
     bool bShowDashboardAtStartup;
-    bool m_showCircularDependencyError;
     bool bAutoloadLastLevelAtStartup;
     bool bMuteAudio;
 
@@ -412,11 +405,16 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
     int backgroundUpdatePeriod;
     const char* g_TemporaryLevelName;
 
-    SSliceSettings sliceSettings;
-
     SLevelSaveSettings levelSaveSettings;
 
-    bool prefabSystem = true;                  ///< Toggle to enable/disable the Prefab system for level entities.
+    // Legacy - remove once all references have been removed.
+    struct SSliceSettings
+    {
+        bool dynamicByDefault;
+    };
+
+    SSliceSettings sliceSettings;
+    bool prefabSystem = true;
 
 private:
     void SaveValue(const char* sSection, const char* sKey, int value);

Code/Framework/AzFramework/AzFramework/Application/Application.cpp

@@ -89,7 +89,6 @@ namespace AzFramework
     namespace ApplicationInternal
     {
         static constexpr const char s_editorModeFeedbackKey[] = "/Amazon/Preferences/EnableEditorModeFeedback";
-        static constexpr const char s_prefabSystemKey[] = "/Amazon/Preferences/EnablePrefabSystem";
         static constexpr const char s_prefabWipSystemKey[] = "/Amazon/Preferences/EnablePrefabSystemWipFeatures";
         static constexpr const char s_legacySlicesAssertKey[] = "/Amazon/Preferences/ShouldAssertForLegacySlicesUsage";
         static constexpr const char* DeprecatedFileIOAliasesRoot = "/O3DE/AzCore/FileIO/DeprecatedAliases";
@@ -771,12 +770,8 @@ namespace AzFramework
 
     bool Application::IsPrefabSystemEnabled() const
     {
-        bool value = true;
-        if (auto* registry = AZ::SettingsRegistry::Get())
-        {
-            registry->Get(value, ApplicationInternal::s_prefabSystemKey);
-        }
-        return value;
+        AZ_Warning("Application", false, "'IsPrefabSystemEnabled' is deprecated, the editor only supports prefabs for level editing.");
+        return true;
     }
 
     bool Application::ArePrefabWipFeaturesEnabled() const
@@ -789,18 +784,15 @@ namespace AzFramework
         return value;
     }
 
-    void Application::SetPrefabSystemEnabled(bool enable)
+    void Application::SetPrefabSystemEnabled(bool /* enable */)
     {
-        if (auto* registry = AZ::SettingsRegistry::Get())
-        {
-            registry->Set(ApplicationInternal::s_prefabSystemKey, enable);
-        }
+        AZ_Warning("Application", false, "'SetPrefabSystemEnabled' is deprecated, the editor only supports prefabs for level editing.");
     }
 
     bool Application::IsPrefabSystemForLevelsEnabled() const
     {
-        AZ_Warning("Application", false, "'IsPrefabSystemForLevelsEnabled' is deprecated, please use 'IsPrefabSystemEnabled' instead.");
-        return IsPrefabSystemEnabled();
+        AZ_Warning("Application", false, "'IsPrefabSystemForLevelsEnabled' is deprecated, the editor only supports prefabs for level editing.");
+        return true;
     }
 
     bool Application::ShouldAssertForLegacySlicesUsage() const