merge develop

Signed-off-by: igarri <igarri@amazon.com>
2021-10-18 12:42:00 +01:00
parent d8a453f826 207ec6e60d
commit 6050d2e16e
1116 changed files with 18464 additions and 13648 deletions
@@ -15,6 +15,7 @@

 namespace SandboxEditor
 {
+    constexpr AZStd::string_view AssetBrowserMaxItemsShownInSearchSetting = "/Amazon/Preferences/Editor/AssetBrowser/MaxItemsShowInSearch";
    constexpr AZStd::string_view GridSnappingSetting = "/Amazon/Preferences/Editor/GridSnapping";
    constexpr AZStd::string_view GridSizeSetting = "/Amazon/Preferences/Editor/GridSize";
    constexpr AZStd::string_view AngleSnappingSetting = "/Amazon/Preferences/Editor/AngleSnapping";
@@ -128,6 +129,16 @@ namespace SandboxEditor
        SetRegistry(CameraDefaultStartingPositionZ, defaultCameraPosition.GetZ());
    }

+    AZ::u64 MaxItemsShownInAssetBrowserSearch()
+    {
+        return GetRegistry(AssetBrowserMaxItemsShownInSearchSetting, aznumeric_cast<AZ::u64>(50));
+    }
+
+    void SetMaxItemsShownInAssetBrowserSearch(const AZ::u64 numberOfItemsShown)
+    {
+        SetRegistry(AssetBrowserMaxItemsShownInSearchSetting, numberOfItemsShown);
+    }
+
    bool GridSnappingEnabled()
    {
        return GetRegistry(GridSnappingSetting, false);