Unity 6000.1.0a4 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs

@@ -697,7 +697,7 @@ void RebuildAllCurvesCacheIfNecessary()
                 m_AllCurvesCache.Clear();
 
             var animationClip = activeAnimationClip;
-            if (animationClip == null)
+            if (animationClip == null || (!selection.animationIsEditable && !showReadOnly))
                 return;
 
             EditorCurveBinding[] curveBindings = AnimationUtility.GetCurveBindings(animationClip);

Editor/Mono/AssetStore/AssetStoreWindow.cs

@@ -29,7 +29,7 @@ public static AssetStoreWindow Init()
             }
         }
 
-        [MenuItem("Window/Asset Store", false, 1497)]
+        [MenuItem("Window/Package Management/Asset Store", false, 2000)]
         public static void OpenAssetStoreInBrowser()
         {
             string assetStoreUrl = UnityConnect.instance.GetConfigurationURL(CloudConfigUrl.CloudAssetStoreUrl);
@@ -39,7 +39,7 @@ public static void OpenAssetStoreInBrowser()
             else Application.OpenURL(assetStoreUrl);
         }
 
-        [MenuItem("Window/My Assets", false, 1498)]
+        [MenuItem("Window/Package Management/My Assets", false, 1501)]
         public static void OpenMyAssetsInPackageManager()
         {
             PackageManagerWindow.OpenAndSelectPage(PackageManager.UI.Internal.MyAssetsPage.k_Id);

Editor/Mono/BuildPipeline/BuildPlatform.cs

@@ -119,6 +119,7 @@ static Texture2D DuplicateAsReadableTexture(Texture2D sourceTexture)
                 RenderTexture.active = renderTexture;
                 var readableTexture = new Texture2D(sourceTexture.width, sourceTexture.height);
                 readableTexture.ReadPixels(new Rect(0, 0, renderTexture.width, renderTexture.height), 0, 0);
+                readableTexture.pixelsPerPoint = sourceTexture.pixelsPerPoint;
                 readableTexture.Apply();
                 RenderTexture.active = previouslyActiveRenderTexture;
                 RenderTexture.ReleaseTemporary(renderTexture);

Editor/Mono/BuildProfile/BuildProfileContext.cs

@@ -280,6 +280,9 @@ internal List<GUID> GetMissingKnownPlatformModules()
                 if (m_PlatformIdToClassicPlatformProfile.ContainsKey(key))
                     continue;
 
+                if (BuildProfileModuleUtil.IsPlatformVisibleInPlatformBrowserOnly(key))
+                    continue;
+
                 // Installed flag, as calculated by BuildPlatform
                 if (BuildProfileModuleUtil.IsModuleInstalled(key))
                     continue;
@@ -625,7 +628,6 @@ static void CreateOrLoad()
             {
                 s_Instance = CreateInstance<BuildProfileContext>();
                 s_Instance.hideFlags = HideFlags.DontSave;
-                Save();
             }
 
             System.Diagnostics.Debug.Assert(s_Instance != null);

Editor/Mono/BuildProfile/BuildProfileCreate.cs

@@ -56,10 +56,9 @@ internal static BuildProfile CreateInstance(GUID platformId)
         /// event after an asset is created by AssetDatabase.CreateAsset.
         /// </summary>
         [VisibleToOtherModules("UnityEditor.BuildProfileModule")]
-        internal static void CreateInstance(GUID platformId, string assetPath)
+        internal static void CreateInstance(GUID platformId, string assetPath, int preconfiguredSettingsVariant = -1)
         {
             var (buildTarget, subtarget) = BuildProfileModuleUtil.GetBuildTargetAndSubtarget(platformId);
-            var moduleName = BuildProfileModuleUtil.GetModuleName(buildTarget);
             var buildProfile = CreateInstance<BuildProfile>();
             buildProfile.buildTarget = buildTarget;
             buildProfile.subtarget = subtarget;
@@ -68,10 +67,20 @@ internal static void CreateInstance(GUID platformId, string assetPath)
                 buildProfile,
                 AssetDatabase.GenerateUniqueAssetPath(assetPath));
             buildProfile.OnEnable();
+            buildProfile.NotifyBuildProfileExtensionOfCreation(preconfiguredSettingsVariant);
             // Notify the UI of creation so that the new build profile can be selected
             onBuildProfileCreated?.Invoke(buildProfile);
         }
 
+        internal void NotifyBuildProfileExtensionOfCreation(int preconfiguredSettingsVariant)
+        {
+            var buildProfileExtension = BuildProfileModuleUtil.GetBuildProfileExtension(platformGuid);
+            if (buildProfileExtension != null)
+            {
+                buildProfileExtension.OnBuildProfileCreated(this, preconfiguredSettingsVariant);
+            }
+        }
+
         void TryCreatePlatformSettings()
         {
             if (platformBuildProfile != null)
@@ -88,6 +97,20 @@ void TryCreatePlatformSettings()
             }
         }
 
+        /// <summary>
+        /// Add Graphics Settings overrides to the build profile.
+        /// </summary>
+        internal void CreateGraphicsSettings()
+        {
+            if (graphicsSettings != null)
+                return;
+
+            graphicsSettings = CreateInstance<BuildProfileGraphicsSettings>();
+            graphicsSettings.Instantiate();
+            AssetDatabase.AddObjectToAsset(graphicsSettings, this);
+            EditorUtility.SetDirty(this);
+        }
+
         /// <summary>
         /// Remove the Graphics Settings overrides from the build profile.
         /// </summary>
@@ -103,6 +126,20 @@ internal void RemoveGraphicsSettings()
             OnGraphicsSettingsSubAssetRemoved?.Invoke();
         }
 
+        /// <summary>
+        /// Add Quality Settings overrides to the build profile.
+        /// </summary>
+        internal void CreateQualitySettings()
+        {
+            if (qualitySettings != null)
+                return;
+
+            qualitySettings = ScriptableObject.CreateInstance<BuildProfileQualitySettings>();
+            qualitySettings.Instantiate();
+            AssetDatabase.AddObjectToAsset(qualitySettings, this);
+            EditorUtility.SetDirty(this);
+        }
+
         /// <summary>
         /// Remove the Quality Settings overrides from the build profile.
         /// </summary>

Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Text;
 using UnityEditor.Modules;
 using UnityEditor.Rendering;
 using UnityEngine;
@@ -427,6 +428,43 @@ public static void RemovePlayerSettings(BuildProfile buildProfile)
             buildProfile.RemovePlayerSettings(clearYaml: true);
         }
 
+        /// <summary>
+        /// Create graphics settings override for build profile
+        /// </summary>
+        public static void CreateGraphicsSettings(BuildProfile buildProfile)
+        {
+            buildProfile.CreateGraphicsSettings();
+        }
+
+        /// <summary>
+        /// Remove build profile graphics settings override
+        /// </summary>
+        public static void RemoveGraphicsSettings(BuildProfile buildProfile)
+        {
+            buildProfile.RemoveGraphicsSettings();
+        }
+
+        /// <summary>
+        /// Create graphics settings quality for build profile
+        /// </summary>
+        public static void CreateQualitySettings(BuildProfile buildProfile)
+        {
+            buildProfile.CreateQualitySettings();
+        }
+
+        /// <summary>
+        /// Remove build profile quality settings override
+        /// </summary>
+        public static void RemoveQualitySettings(BuildProfile buildProfile)
+        {
+            buildProfile.RemoveQualitySettings();
+        }
+
+        public static void NotifyBuildProfileExtensionOfCreation(BuildProfile buildProfile, int preconfiguredSettingsVariant)
+        {
+            buildProfile.NotifyBuildProfileExtensionOfCreation(preconfiguredSettingsVariant);
+        }
+
         /// <summary>
         /// Create player settings for build profile based on global player settings
         /// </summary>
@@ -680,7 +718,7 @@ public static List<BuildProfile> GetAllBuildProfiles()
             return result;
         }
 
-        public static string[] GetSettingsRequiringRestart(PlayerSettings previousProfileSettings, PlayerSettings newProfileSettings, BuildTarget oldBuildTarget, BuildTarget newBuildTarget)
+        public static PlayerSettingsRequiringRestart[] GetSettingsRequiringRestart(PlayerSettings previousProfileSettings, PlayerSettings newProfileSettings, BuildTarget oldBuildTarget, BuildTarget newBuildTarget)
         {
             return PlayerSettings.GetSettingsRequiringRestart(previousProfileSettings, newProfileSettings, oldBuildTarget, newBuildTarget);
         }
@@ -722,14 +760,19 @@ public static bool HandlePlayerSettingsChanged(
                 }
             }
 
-            string[] settingsRequiringRestart = GetSettingsRequiringRestart(currentPlayerSettings,
+            var settingsRequiringRestart = GetSettingsRequiringRestart(currentPlayerSettings,
                 nextPlayerSettings, currentBuildTarget, nextBuildTarget);
             // if we've found settings that need restarting..
             if (settingsRequiringRestart.Length > 0 )
             {
                 // ..we show the restart prompt, if the user restarts, we add a restart call to the editor
                 if (ShowRestartEditorDialog(settingsRequiringRestart))
                 {
+                    if (ContainsPlayerSetting(settingsRequiringRestart, PlayerSettingsRequiringRestart.VirtualTexturing))
+                    {
+                        PlayerSettings.SyncVirtualTexturingState(nextPlayerSettings);
+                    }
+
                     EditorApplication.delayCall += EditorApplication.RestartEditorAndRecompileScripts;
                     return true;
                 }
@@ -746,22 +789,21 @@ public static bool HandlePlayerSettingsChanged(
             return true;
         }
 
+
         /// <summary>
         /// Show the restart editor dialog with the names of the settings that required the restart to take effect.
         /// </summary>
-        static bool ShowRestartEditorDialog(string[] settingsRequiringRestart)
+        static bool ShowRestartEditorDialog(PlayerSettingsRequiringRestart[] settingsRequiringRestart)
         {
-            var editorPromptText = new System.Text.StringBuilder();
+            var editorPromptText = new StringBuilder();
             editorPromptText.AppendLine(L10n.Tr("The Unity editor must be restarted for the following settings to take effect:"));
-            for (int i = 0; i < settingsRequiringRestart.Length; i++)
-            {
-                editorPromptText.AppendLine(settingsRequiringRestart[i]);
-            }
-
+            var playerSettingNames = GetPlayerSettingNamesToEditorRestartPromptText(settingsRequiringRestart);
+            editorPromptText.AppendLine(playerSettingNames.ToString());
             return EditorUtility.DisplayDialog(L10n.Tr("Unity editor restart required"),
                 editorPromptText.ToString(), L10n.Tr("Apply"), L10n.Tr("Cancel"));
         }
 
+
         internal static PlayerSettings GetBuildProfileOrGlobalPlayerSettings(BuildProfile buildProfile)
         {
             if (buildProfile == null || buildProfile.playerSettings == null)
@@ -770,5 +812,62 @@ internal static PlayerSettings GetBuildProfileOrGlobalPlayerSettings(BuildProfil
             }
             return buildProfile.playerSettings;
         }
+
+        public static bool IsBasePlatformOfActivePlatform(GUID platformGuid)
+        {
+            var module = ModuleManager.FindPlatformSupportModule(EditorUserBuildSettings.activePlatformGuid);
+            if (module == null)
+                return false;
+            if (module is IDerivedBuildTargetProvider derivedBuildTargetProvider)
+            {
+                var basePlatformGuid = derivedBuildTargetProvider.GetBasePlatformGuid();
+                return basePlatformGuid == platformGuid;
+            }
+            return false;
+        }
+
+        public static void RepaintProjectSettingsWindow()
+        {
+            foreach (var window in EditorWindow.activeEditorWindows)
+            {
+                if (window is ProjectSettingsWindow)
+                {
+                    window.Repaint();
+                }
+            }
+        }
+
+        /*
+         * private helper functions
+         */
+        private static bool ContainsPlayerSetting(PlayerSettingsRequiringRestart[] playerSettings, PlayerSettingsRequiringRestart targetSetting)
+        {
+            foreach (PlayerSettingsRequiringRestart setting in playerSettings)
+            {
+                if (setting == targetSetting)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        private static StringBuilder GetPlayerSettingNamesToEditorRestartPromptText(PlayerSettingsRequiringRestart[] settingsRequiringRestart)
+        {
+            var settingsText = new StringBuilder();
+            foreach (PlayerSettingsRequiringRestart setting in settingsRequiringRestart)
+            {
+                var settingPromptText = setting switch
+                {
+                    PlayerSettingsRequiringRestart.IncrementalGC => "Incremental GC",
+                    PlayerSettingsRequiringRestart.ActiveInputHandling => "Active Input Handling",
+                    PlayerSettingsRequiringRestart.GraphicsJobs => "Graphics Jobs",
+                    PlayerSettingsRequiringRestart.VirtualTexturing => "Virtual Texturing",
+                    _ => string.Empty
+                };
+                settingsText.AppendLine(settingPromptText);
+            }
+            return settingsText;
+        }
     }
 }

Editor/Mono/BuildProfile/BuildProfileQualitySettings.cs

@@ -62,5 +62,15 @@ public void RenameQualityLevel(string oldName, string newName)
 
             EditorUtility.SetDirty(this);
         }
+
+        public void AddQualityLevel(string qualityLevel)
+        {
+            var newQualityLevels = new string[qualityLevels.Length + 1];
+            Array.Copy(qualityLevels, 0, newQualityLevels, 0, qualityLevels.Length);
+            newQualityLevels[qualityLevels.Length] = qualityLevel;
+            qualityLevels = newQualityLevels;
+
+            EditorUtility.SetDirty(this);
+        }
     }
 }