Unity 6000.2.0a6 C# reference source code

Author: Unity Technologies

Editor/Mono/AssemblyInfo/AssemblyInfo.cs

@@ -50,6 +50,8 @@
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.Misc")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.PackageManager")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.Profiler")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.PS4")]
+[assembly: InternalsVisibleTo("Unity.IntegrationTests.PS5")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.Rendering")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.SceneVisibility")]
 [assembly: InternalsVisibleTo("Unity.IntegrationTests.ScriptCompilation")]

Editor/Mono/BuildPlayerWindow.cs

@@ -491,52 +491,9 @@ void OnGUI()
             {
                 styles = new Styles();
             }
-
-            if (!UnityConnect.instance.canBuildWithUPID)
-            {
-                ShowAlert();
-            }
-            GUILayout.Space(5);
-            GUILayout.BeginHorizontal();
-            GUILayout.Space(10);
-            GUILayout.BeginVertical();
-
-            string message = "";
-            var buildSettingsLocked = !AssetDatabase.IsOpenForEdit(kEditorBuildSettingsPath, out message, StatusQueryOptions.UseCachedIfPossible);
-
-            using (new EditorGUI.DisabledScope(buildSettingsLocked))
-            {
-                ActiveScenesGUI();
-                // Clear all and Add Current Scene
-                GUILayout.BeginHorizontal();
-                if (buildSettingsLocked)
-                {
-                    GUI.enabled = true;
-                    if (GUILayout.Button(styles.checkOut))
-                        AssetDatabase.MakeEditable(kEditorBuildSettingsPath);
-                    GUILayout.Label(message);
-                    GUI.enabled = false;
-                }
-                GUILayout.FlexibleSpace();
-                if (GUILayout.Button(styles.addOpenSource))
-                    AddOpenScenes();
-                GUILayout.EndHorizontal();
-            }
-
-            GUILayout.Space(10);
-
-            GUILayout.BeginHorizontal(GUILayout.Height(400));
-            ActiveBuildTargetsGUI();
-            GUILayout.Space(10);
-            GUILayout.BeginVertical();
-            ShowBuildTargetSettings();
-            GUILayout.EndVertical();
-            GUILayout.EndHorizontal();
-
-            GUILayout.Space(10);
-            GUILayout.EndVertical();
-            GUILayout.Space(10);
-            GUILayout.EndHorizontal();
+            // Override the 'old' build settings window in favor of the new build profile window.
+            BuildPipeline.ShowBuildProfileWindow();
+            Close();
         }
 
         static bool IsAnyStandaloneModuleLoaded()

Editor/Mono/BuildProfile/BuildProfileAPI.cs

@@ -33,5 +33,41 @@ public static void SetActiveBuildProfile(BuildProfile buildProfile)
 
             BuildProfileModuleUtil.SwitchLegacyActiveFromBuildProfile(buildProfile);
         }
+
+        /// <summary>
+        /// Gets a component of type T associated with the build profile, its global fallback,
+        /// or null if the component is not available.
+        /// </summary>
+        public T GetComponent<T>() where T : class
+        {
+            if (typeof(T) == typeof(PlayerSettings))
+            {
+                if (m_PlayerSettings != null)
+                    return m_PlayerSettings as T;
+                return s_GlobalPlayerSettings as T;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets a component of type T associated with the currently active build profile,
+        /// its global fallback, or null if the component is not available.
+        /// </summary>
+        public static T GetActiveComponent<T>() where T : class
+        {
+            var buildProfile = GetActiveBuildProfile();
+            if (buildProfile == null)
+            {
+                if (typeof(T) == typeof(PlayerSettings))
+                    return s_GlobalPlayerSettings as T;
+            }
+            else
+            {
+                return buildProfile.GetComponent<T>();
+            }
+
+            return null;
+        }
     }
 }

Editor/Mono/BuildProfile/BuildProfileContext.cs

@@ -842,5 +842,21 @@ static void Save() => InternalEditorUtility.SaveToSerializedFileAndForget(new[]
 
         [VisibleToOtherModules]
         internal static bool IsSharedProfile(GUID platformGuid) => platformGuid.Empty();
+
+        internal static void UpdateScriptingDefineSymbolsInActivePlayerSettingsOverride(NamedBuildTarget buildTarget, string defines)
+        {
+            var profile = activeProfile;
+
+            if (profile == null)
+                return;
+
+            if (profile.playerSettings == null)
+                return;
+
+            PlayerSettings.SetScriptingDefineSymbols_Internal(profile.playerSettings, buildTarget.TargetName, defines);
+            profile.SerializePlayerSettings();
+            EditorUtility.SetDirty(profile);
+            AssetDatabase.SaveAssetIfDirty(profile);
+        }
     }
 }

Editor/Mono/BuildProfile/BuildProfileCreate.cs

@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.IO;
 using JetBrains.Annotations;
 using UnityEditor.Modules;
 using UnityEngine;
@@ -67,6 +68,7 @@ internal static void CreateInstance(GUID platformId, string assetPath)
         [VisibleToOtherModules("UnityEditor.BuildProfileModule")]
         internal static void CreateInstance(GUID platformId, string assetPath, int preconfiguredSettingsVariant, string[] packagesToAdd)
         {
+            ValidateFileNameLength(assetPath);
             ValidatePlatform(platformId);
 
             var (buildTarget, subtarget) = BuildProfileModuleUtil.GetBuildTargetAndSubtarget(platformId);
@@ -99,6 +101,18 @@ static void ValidatePlatform(GUID platformGuid)
             throw new ArgumentException("A build profile must be created for a valid platform.");
         }
 
+        /// <summary>
+        /// Validates if the provided path name length is supported by the Asset database.
+        /// Throws an ArgumentException if the platform is not valid.
+        /// </summary>
+        /// <param name="assetPath">The path to the build profile to be created.</param>
+        static void ValidateFileNameLength(string assetPath)
+        {
+            // File name length is limited by the asset database
+            if (Path.GetFileName(assetPath).Length > BuildProfileModuleUtil.k_MaxAssetFileNameLength)
+                throw new ArgumentException($"Build profile name is too long ({Path.GetFileName(assetPath).Length}) - max supported is {BuildProfileModuleUtil.k_MaxAssetFileNameLength}");
+        }
+
         internal void NotifyBuildProfileExtensionOfCreation(int preconfiguredSettingsVariant)
         {
             var buildProfileExtension = BuildProfileModuleUtil.GetBuildProfileExtension(platformGuid);

Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs

@@ -25,6 +25,12 @@ internal class BuildProfileModuleUtil
         const string k_BuyProUrl = "https://store.unity.com/products/unity-pro";
         const string k_ConsoleModuleUrl = "https://unity3d.com/platform-installation";
         const string k_LastRunnableBuildPathSeparator = "_";
+        // The asset database supports file name length to max. 250 symbols
+        // Leave 3 symbols for the GenerateUniqueAssetPath() that adds " 1"(2,3...) in case
+        // an asset with such name already exists.
+        public const int k_MaxAssetFileNameLength = 247;
+        // For UI cases where the extension `.asset` is not taken into consideration
+        public const int k_MaxAssetFileNameLengthWithoutExtension = k_MaxAssetFileNameLength - 6;
         static readonly string k_NoModuleLoaded = L10n.Tr("No {0} module loaded.");
         static readonly string k_DerivedPlatformInactive = L10n.Tr("{0} is currently disabled.");
         static readonly string k_EditorWillNeedToBeReloaded = L10n.Tr("Note: Editor will need to be restarted to load any newly installed modules");

Editor/Mono/BuildProfile/BuildProfileRenameOverlay.cs

@@ -18,6 +18,7 @@ internal class BuildProfileRenameOverlay
     {
         static readonly string k_InvalidChars = BuildProfileModuleUtil.GetFilenameInvalidCharactersStr();
         static readonly string k_ErrorMessage = string.Format(L10n.Tr("A file name can't contain any of the following characters:\t{0}"), k_InvalidChars);
+        static readonly string k_ErrorMessageLength = string.Format(L10n.Tr("Build profile name can't be longer than {0} symbols"), BuildProfileModuleUtil.k_MaxAssetFileNameLengthWithoutExtension);
 
         TextField m_TextField;
         Rect? m_ErrorRect = null;
@@ -56,6 +57,16 @@ public void OnNameChanged(string previousValue, string newValue)
                 m_TextField.cursorIndex = targetIndex;
                 m_TextField.selectIndex = targetIndex;
             }
+            else if (newValue.Length > BuildProfileModuleUtil.k_MaxAssetFileNameLengthWithoutExtension)
+            {
+                TooltipView.Show(k_ErrorMessageLength, errorRect);
+                m_TextField.SetValueWithoutNotify(previousValue);
+
+                // The cursor should be kept in place when adding too much
+                var targetIndex = Mathf.Max(m_TextField.cursorIndex - 1, 0);
+                m_TextField.cursorIndex = targetIndex;
+                m_TextField.selectIndex = targetIndex;
+            }
             else
             {
                 TooltipView.ForceClose();

Editor/Mono/ContextMenuUtility.cs

@@ -169,11 +169,16 @@ public static void AddGameObjectEntriesTo(DropdownMenu menu)
         internal static DropdownMenu CreateActionMenu()
         {
             var contextMenu = new DropdownMenu();
+
+            Menu.CreateActionMenuBegin();
+
             EditorToolManager.activeToolContext.PopulateMenu(contextMenu);
             AddMenuItemsForType(contextMenu, ToolManager.activeContextType, EditorToolManager.activeToolContext.targets);
             EditorToolManager.activeTool.PopulateMenu(contextMenu);
             AddMenuItemsForType(contextMenu, ToolManager.activeToolType, EditorToolManager.activeTool.targets);
 
+            Menu.CreateActionMenuEnd();
+
             return contextMenu;
         }
 

Editor/Mono/EditorGUI.cs

@@ -581,6 +581,7 @@ public virtual void EndEditing()
             {
                 if (activeEditor == this)
                 {
+                    activeEditor.m_HasFocus = false;
                     activeEditor = null;
                 }
 
@@ -7683,7 +7684,7 @@ internal static bool DefaultPropertyField(Rect position, SerializedProperty prop
                         bool toggled = DropdownButton(position, toggleLabelContent, FocusType.Keyboard, EditorStyles.layerMaskField);
                         if (toggled)
                         {
-                            PopupWindowWithoutFocus.Show(position, new MaskFieldDropDown(property));
+                            PopupWindow.Show(position, new MaskFieldDropDown(property));
                             GUIUtility.ExitGUI();
                         }
                         break;

Editor/Mono/EditorSettings.bindings.cs

@@ -242,6 +242,9 @@ internal static extern string Internal_ProjectGenerationUserExtensions
         [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
         public static extern bool useLegacyProbeSampleCount { get; set; }
 
+        [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
+        public static extern bool shadowmaskStitching { get; set; }
+
         [Obsolete("The disableCookiesInLightmapper setting is no longer supported. Cookies are always enabled in the Progressive Lightmapper.", true)]
         public static bool disableCookiesInLightmapper
         {