Unity 2023.3.0b1 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/CurveEditor.cs

@@ -3833,6 +3833,10 @@ WrapMode WrapModeIconPopup(Keyframe key, WrapMode oldWrap, float hOffset)
                 case EventType.MouseDown:
                     if (evt.button == 0 && r.Contains(evt.mousePosition))
                     {
+                        if (Application.platform == RuntimePlatform.OSXEditor)
+                        {
+                            r.y = r.y - selectedPopupIndex * 16 - 19;
+                        }
                         EditorGUI.PopupCallbackInfo.instance = new EditorGUI.PopupCallbackInfo(controlID);
                         EditorUtility.DisplayCustomMenu(r, popupStrings, selectedPopupIndex, EditorGUI.PopupCallbackInfo.instance.SetEnumValueDelegate, null);
                         GUIUtility.keyboardControl = controlID;
@@ -3842,6 +3846,10 @@ WrapMode WrapModeIconPopup(Keyframe key, WrapMode oldWrap, float hOffset)
                 case EventType.KeyDown:
                     if (evt.MainActionKeyForControl(controlID))
                     {
+                        if (Application.platform == RuntimePlatform.OSXEditor)
+                        {
+                            r.y = r.y - selectedPopupIndex * 16 - 19;
+                        }
                         EditorGUI.PopupCallbackInfo.instance = new EditorGUI.PopupCallbackInfo(controlID);
                         EditorUtility.DisplayCustomMenu(r, popupStrings, selectedPopupIndex, EditorGUI.PopupCallbackInfo.instance.SetEnumValueDelegate, null);
                         evt.Use();

Editor/Mono/BuildPipeline.bindings.cs

@@ -186,7 +186,10 @@ public enum BuildAssetBundleOptions
         AssetBundleStripUnityVersion = 32768, // 1 << 15
 
         // Calculate bundle hash on the bundle content
-        UseContentHash = 65536 // 1 << 16
+        UseContentHash = 65536, // 1 << 16
+
+        // Use when AssetBundle dependencies need to be calculated recursively, such as when you have a dependency chain of matching typed Scriptable Objects
+        RecurseDependencies = 131072 // 1 << 17
     }
 
     // Keep in sync with CanAppendBuild in EditorUtility.h

Editor/Mono/BuildProfile/BuildProfile.cs

@@ -79,6 +79,28 @@ public EditorBuildSettingsScene[] scenes
             }
         }
 
+        /// <summary>
+        /// Returns true if the given <see cref="BuildProfile"/> is the active profile or a classic
+        /// profile for the EditorUserBuildSettings active build target.
+        /// </summary>
+        [VisibleToOtherModules]
+        internal bool IsActiveBuildProfileOrPlatform()
+        {
+            if (BuildProfileContext.instance.activeProfile == this)
+                return true;
+
+            if (BuildProfileContext.instance.activeProfile is not null
+                || !BuildProfileContext.IsClassicPlatformProfile(this))
+                return false;
+
+            if (!BuildProfileModuleUtil.IsStandalonePlatform(buildTarget))
+                return buildTarget == EditorUserBuildSettings.activeBuildTarget;
+
+            var profileModuleName = BuildProfileModuleUtil.GetModuleName(buildTarget);
+            var activeModuleName = BuildProfileModuleUtil.GetModuleName(EditorUserBuildSettings.activeBuildTarget);
+            return profileModuleName == activeModuleName && subtarget == EditorUserBuildSettings.standaloneBuildSubtarget;
+        }
+
         void OnEnable()
         {
             // Check if the platform support module has been installed,

Editor/Mono/BuildProfile/BuildProfileContext.cs

@@ -172,51 +172,16 @@ internal static BuildProfile GetActiveOrClassicBuildProfile(
             return IsSharedProfile(target) ? instance.sharedProfile : instance.GetForClassicPlatform(target, subTarget);
         }
 
-        [RequiredByNativeCode]
-        internal static BuildProfile GetClassicProfileAndResetActive(
-            BuildTarget target, StandaloneBuildSubtarget subTarget = StandaloneBuildSubtarget.Default, string sharedSetting = null)
-        {
-            if (ShouldReturnActiveProfile(target, subTarget, sharedSetting))
-            {
-                // When invoking a legacy setter, we unset the active profile to prevent
-                // inconsistencies with legacy APIs. That is, all legacy APIs need to write to
-                // the classic platform build profile directly. When doing this, the next getter
-                // MUST return the classic platform build profile containing the newly set value.
-                // The active build profile should be updated directly.
-                ResetActiveProfile();
-            }
-
-            return IsSharedProfile(target) ? instance.sharedProfile : instance.GetForClassicPlatform(target, subTarget);
-        }
-
-        [RequiredByNativeCode, UsedImplicitly]
-        internal static void ResetActiveProfile()
-        {
-            if (instance.activeProfile is null)
-                return;
-
-            Debug.LogWarning($"[BuildProfile] Active build profile ({AssetDatabase.GetAssetPath(instance.activeProfile)}) is set when calling a global platform API.");
-            instance.activeProfile = null;
-        }
-
         internal static bool TryGetActiveOrClassicPlatformSettingsBase<T>(
             BuildTarget target, StandaloneBuildSubtarget subTarget, out T result) where T : BuildProfilePlatformSettingsBase
         {
-            BuildProfile buildProfile = GetActiveOrClassicBuildProfile(target, subTarget);
-            if (buildProfile != null && buildProfile.platformBuildProfile is T platformProfile)
+            if (!EditorUserBuildSettings.IsBuildProfileScriptingAvailable())
             {
-                result = platformProfile;
-                return true;
+                result = null;
+                return false;
             }
 
-            result = null;
-            return false;
-        }
-
-        internal static bool TryGetClassicPlatformSettingsBaseAndResetActive<T>(
-            BuildTarget target, StandaloneBuildSubtarget subTarget, out T result) where T : BuildProfilePlatformSettingsBase
-        {
-            BuildProfile buildProfile = GetClassicProfileAndResetActive(target, subTarget);
+            BuildProfile buildProfile = GetActiveOrClassicBuildProfile(target, subTarget);
             if (buildProfile != null && buildProfile.platformBuildProfile is T platformProfile)
             {
                 result = platformProfile;
@@ -301,17 +266,11 @@ void OnEnable()
             if (!Directory.Exists(k_BuildProfilePath))
                 return;
 
-            // No need to load classic profiles if build profile is disabled.
-            if (!EditorUserBuildSettings.IsBuildProfileWorkflowEnabled())
-            {
-                return;
-            }
-
-            foreach (var platform in BuildPlatforms.instance.GetValidPlatforms())
+            var viewablePlatformKeys = BuildProfileModuleUtil.FindAllViewablePlatforms();
+            for (var index = 0; index < viewablePlatformKeys.Count; index++)
             {
-                string path = (platform is BuildPlatformWithSubtarget platformWithSubtarget) ?
-                    GetFilePathForBuildProfile(GetKey(platform.defaultTarget, (StandaloneBuildSubtarget)platformWithSubtarget.subtarget)) :
-                    GetFilePathForBuildProfile(GetKey(platform.defaultTarget, StandaloneBuildSubtarget.Default));
+                var key = viewablePlatformKeys[index];
+                string path = GetFilePathForBuildProfile(key);
 
                 if (!File.Exists(path))
                     continue;
@@ -346,31 +305,26 @@ void OnEnable()
         /// </summary>
         void CheckInstalledBuildPlatforms()
         {
-            foreach (var platform in BuildPlatforms.instance.GetValidPlatforms())
+            var viewablePlatformKeys = BuildProfileModuleUtil.FindAllViewablePlatforms();
+            for (var index = 0; index < viewablePlatformKeys.Count; index++)
             {
-                string targetString = ModuleManager.GetTargetStringFromBuildTarget(platform.defaultTarget);
-                if (!ModuleManager.IsPlatformSupportLoaded(targetString))
-                {
+                var key = viewablePlatformKeys[index];
+                var moduleName = key.Item1;
+                var subtarget = key.Item2;
+
+                if (!BuildProfileModuleUtil.IsModuleInstalled(moduleName, subtarget))
                     continue;
-                }
 
-                if (ModuleManager.GetBuildProfileExtension(targetString) == null)
+                if (ModuleManager.GetBuildProfileExtension(moduleName) == null)
                 {
                     // Require platform support and implemented build profile
                     // extension for the target platform.
-                    Debug.LogWarning("Platform does not support build profiles targetString=" + targetString);
+                    Debug.LogWarning("Platform does not support build profiles targetString=" + moduleName);
                     continue;
                 }
 
-                if (platform is BuildPlatformWithSubtarget platformWithSubtarget)
-                {
-                    GetOrCreateClassicPlatformBuildProfile(platform.defaultTarget,
-                        (StandaloneBuildSubtarget)platformWithSubtarget.subtarget);
-                }
-                else
-                {
-                    GetOrCreateClassicPlatformBuildProfile(platform.defaultTarget, StandaloneBuildSubtarget.Default);
-                }
+                var buildTarget = BuildProfileModuleUtil.GetBuildTarget(moduleName);
+                GetOrCreateClassicPlatformBuildProfile(buildTarget, subtarget);
             }
 
             GetOrCreateSharedBuildProfile();
@@ -462,7 +416,7 @@ static void SaveBuildProfileInProject(BuildProfile profile)
         static void CreateOrLoad()
         {
             var buildProfileContext = InternalEditorUtility.LoadSerializedFileAndForget(k_BuildProfileProviderAssetPath);
-            if (buildProfileContext != null && buildProfileContext.Length > 0)
+            if (buildProfileContext != null && buildProfileContext.Length > 0 && buildProfileContext[0] != null)
             {
                 s_Instance = buildProfileContext[0] as BuildProfileContext;
                 if (s_Instance == null)
@@ -476,39 +430,22 @@ static void CreateOrLoad()
             }
 
             System.Diagnostics.Debug.Assert(s_Instance != null);
-
-            // Only check installed build platforms to create classic profiles
-            // when the build profile flag is enabled. We need to check here
-            // because this method can be called from the static constructor.
-            // So we should only set the instance but not create profiles
-            if (EditorUserBuildSettings.IsBuildProfileWorkflowEnabled())
-            {
-                s_Instance.CheckInstalledBuildPlatforms();
-            }
+            s_Instance.CheckInstalledBuildPlatforms();
         }
 
         [RequiredByNativeCode, UsedImplicitly]
-        static void SetClassicProfileRawPlatformSetting(string settingName, string settingValue, BuildTarget target, StandaloneBuildSubtarget subtarget)
+        static void SetActiveOrClassicProfileRawPlatformSetting(string settingName, string settingValue, BuildTarget target, StandaloneBuildSubtarget subtarget)
         {
-            // If it is a shared setting, we will reset active to its classic counterpart if the specified shared
-            // setting is enabled in the active profile, and set the value in the shared profile.
+            // If it is a shared setting, we will set the value in the active profile if the specified shared setting
+            // is enabled in the active profile; Otherwise, we will set the value in the shared profile.
             if (IsSharedProfile(target))
             {
-                var profile = GetClassicProfileAndResetActive(target, subtarget, settingName);
+                var profile = GetActiveOrClassicBuildProfile(target, subtarget, settingName);
                 profile?.platformBuildProfile.SetRawPlatformSetting(settingName, settingValue);
                 return;
             }
 
-            // If the setting doesn't exist in classic platform, return
-            BuildProfile classicProfile = instance.GetForClassicPlatform(target, subtarget);
-            if (classicProfile == null || classicProfile.platformBuildProfile == null)
-                return;
-
-            if (classicProfile.platformBuildProfile.GetRawPlatformSetting(settingName) == null)
-                return;
-
-            // Setting exists, so we should set new value and reset active if needed
-            if (TryGetClassicPlatformSettingsBaseAndResetActive(target, subtarget, out BuildProfilePlatformSettingsBase platformProfile))
+            if (TryGetActiveOrClassicPlatformSettingsBase(target, subtarget, out BuildProfilePlatformSettingsBase platformProfile))
             {
                 platformProfile.SetRawPlatformSetting(settingName, settingValue);
             }
@@ -533,7 +470,7 @@ static string GetActiveOrClassicProfileRawPlatformSetting(string settingName, Bu
 
             if (TryGetActiveOrClassicPlatformSettingsBase(target, subtarget, out BuildProfilePlatformSettingsBase platformProfile))
             {
-                string value = platformProfile.GetRawPlatformSetting(settingName);
+                string value = platformProfile?.GetRawPlatformSetting(settingName);
                 return value != null ? value : string.Empty;
             }
 

Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs

@@ -6,6 +6,7 @@
 using UnityEditor.Modules;
 using UnityEngine;
 using UnityEngine.Bindings;
+using UnityEngine.Rendering;
 using UnityEngine.UIElements;
 using TargetAttributes = UnityEditor.BuildTargetDiscovery.TargetAttributes;
 
@@ -25,6 +26,13 @@ internal class BuildProfileModuleUtil
         static readonly GUIContent k_OpenDownloadPage = EditorGUIUtility.TrTextContent("Open Download Page");
         static readonly GUIContent k_InstallModuleWithHub = EditorGUIUtility.TrTextContent("Install with Unity Hub");
         static Dictionary<string, BuildTargetDiscovery.DiscoveredTargetInfo> s_DiscoveredTargetInfos = InitializeDiscoveredTargetDict();
+        static HashSet<string> s_BuildProfileIconModules = new()
+        {
+            "Switch",
+            "QNX",
+            "PS4",
+            "PS5"
+        };
 
         /// <summary>
         /// Classic platform display name for a given build profile. Matching
@@ -48,22 +56,22 @@ public static string GetClassicPlatformDisplayName(string moduleName, Standalone
         /// </summary>
         public static Texture2D GetPlatformIcon(string moduleName, StandaloneBuildSubtarget subtarget)
         {
-            return GetBuildProfileIcon();
-            // TODO: Finalize Icon Design https://jira.unity3d.com/browse/PLAT-7379
-            //       return EditorGUIUtility.LoadIcon(GetPlatformIconId(moduleName, subtarget));
+            if (LoadBuildProfileIcon(moduleName, out Texture2D icon))
+                return icon;
+
+            return EditorGUIUtility.LoadIcon(GetPlatformIconId(moduleName, subtarget));
         }
 
         /// <summary>
         /// Fetch small (16x16) editor platform icon texture.
         /// </summary>
         public static Texture2D GetPlatformIconSmall(string moduleName, StandaloneBuildSubtarget subtarget)
         {
-            return GetBuildProfileIcon();
-            // TODO: Finalize Icon Design https://jira.unity3d.com/browse/PLAT-7379
-            //       return EditorGUIUtility.LoadIcon(GetPlatformIconId(moduleName, subtarget) + ".Small");
-        }
+            if (LoadBuildProfileIcon(moduleName, out Texture2D icon))
+                return icon;
 
-        public static Texture2D GetBuildProfileIcon() => EditorGUIUtility.FindTexture(typeof(UnityEditor.Build.Profile.BuildProfile));
+            return EditorGUIUtility.LoadIcon(GetPlatformIconId(moduleName, subtarget) + ".Small");
+        }
 
         /// <summary>
         /// Load internal warning icon
@@ -256,6 +264,30 @@ public static IBuildProfileExtension GetBuildProfileExtension(BuildTarget buildT
         }
 
         /// <summary>
+        /// Check if the user is able to build his VT-enabled Player for a target platform
+        /// </summary>
+        public static bool IsVirtualTexturingSettingsValid(BuildTarget buildTarget)
+        {
+            if (!PlayerSettings.GetVirtualTexturingSupportEnabled())
+            {
+                return true;
+            }
+
+            if (!UnityEngine.Rendering.VirtualTexturingEditor.Building.IsPlatformSupportedForPlayer(buildTarget))
+            {
+                return false;
+            }
+
+            GraphicsDeviceType[] gfxTypes = PlayerSettings.GetGraphicsAPIs(buildTarget);
+            bool supportedAPI = true;
+            foreach (GraphicsDeviceType api in gfxTypes)
+            {
+                supportedAPI &= UnityEngine.Rendering.VirtualTexturingEditor.Building.IsRenderAPISupported(api, buildTarget, false);
+            }
+
+            return supportedAPI;
+        }
+
         /// Retrieve string of filename invalid characters
         /// </summary>
         /// <returns></returns>
@@ -280,6 +312,18 @@ internal static BuildTarget GetBuildTarget(string moduleName)
             return result;
         }
 
+        static bool LoadBuildProfileIcon(string moduleName, out Texture2D icon)
+        {
+            if (s_BuildProfileIconModules.Contains(moduleName))
+            {
+                icon = EditorGUIUtility.FindTexture(typeof(BuildProfile));
+                return true;
+            }
+
+            icon = null;
+            return false;
+        }
+
         static string GetPlatformIconId(string moduleName, StandaloneBuildSubtarget subtarget)
         {
             if (subtarget == StandaloneBuildSubtarget.Server)