Unity 2023.2.0a15 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/CurveEditor.cs

@@ -3833,11 +3833,6 @@ 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;
@@ -3847,11 +3842,6 @@ 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/AssetPreviewUpdater.cs

@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using UnityEngine;
+using UnityEngine.Rendering;
 
 namespace UnityEditor
 {
@@ -19,6 +20,9 @@ public static Texture2D CreatePreview(Object obj, Object[] subAssets, string ass
             if (obj == null)
                 return null;
 
+            if (!RenderPipelineManager.pipelineSwitchCompleted)
+                return null;
+
             System.Type type = CustomEditorAttributes.FindCustomEditorType(obj, false);
             if (type == null)
                 return null;

Editor/Mono/BuildPipeline/BuildPlatform.cs

@@ -191,10 +191,5 @@ public List<BuildPlatform> GetValidPlatforms()
         {
             return GetValidPlatforms(false);
         }
-
-        public static string[] GetValidPlatformNames()
-        {
-            return instance.GetValidPlatforms().ConvertAll(platform => platform.name).ToArray();
-        }
     }
 }

Editor/Mono/BuildPipeline/NamedBuildTarget.cs

@@ -21,6 +21,7 @@ namespace UnityEditor.Build
             "PS4",
             "XboxOne",
             "tvOS",
+            "Bratwurst",
             "Nintendo Switch",
             "Stadia",
             "CloudRendering",
@@ -44,6 +45,7 @@ namespace UnityEditor.Build
         public static readonly NamedBuildTarget PS5 = new NamedBuildTarget("PS5");
         public static readonly NamedBuildTarget XboxOne = new NamedBuildTarget("XboxOne");
         public static readonly NamedBuildTarget tvOS = new NamedBuildTarget("tvOS");
+        public static readonly NamedBuildTarget Bratwurst = new NamedBuildTarget("Bratwurst");
         public static readonly NamedBuildTarget NintendoSwitch = new NamedBuildTarget("Nintendo Switch");
         [System.Obsolete("Stadia has been removed in 2023.1")]
         public static readonly NamedBuildTarget Stadia = new NamedBuildTarget("Stadia");
@@ -98,6 +100,8 @@ public static NamedBuildTarget FromBuildTargetGroup(BuildTargetGroup buildTarget
                     return NamedBuildTarget.XboxOne;
                 case BuildTargetGroup.tvOS:
                     return NamedBuildTarget.tvOS;
+                case BuildTargetGroup.Bratwurst:
+                    return NamedBuildTarget.Bratwurst;
                 case BuildTargetGroup.Switch:
                     return NamedBuildTarget.NintendoSwitch;
                 case BuildTargetGroup.LinuxHeadlessSimulation:

Editor/Mono/BuildPipeline/EnsureSinglePipelineOnBuild.cs renamed to Editor/Mono/BuildPipeline/RenderPipeline/EnsureSinglePipelineOnBuild.cs

@@ -9,7 +9,7 @@ namespace UnityEditor.Build.Rendering
 {
     class EnsureSinglePipelineOnBuild : IPreprocessBuildWithReport
     {
-        public int callbackOrder => int.MinValue; // We want it to be the first preprocessor to be executed
+        public int callbackOrder => (int) ExecutionOrder.EnsureSinglePipeline;
 
         public void OnPreprocessBuild(BuildReport report)
         {

Editor/Mono/BuildPipeline/RenderPipeline/RenderPipelineBuildProcessor.cs

@@ -0,0 +1,12 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+namespace UnityEditor.Build.Rendering
+{
+    enum ExecutionOrder
+    {
+        EnsureSinglePipeline = int.MinValue,
+        StripRenderPipelineGlobalSettingsAsset,
+    }
+}

Editor/Mono/BuildPipeline/RenderPipeline/RenderPipelineGlobalSettingsStripper.cs

@@ -0,0 +1,38 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEditor.Build.Reporting;
+using UnityEditor.Rendering;
+using UnityEngine;
+using UnityEngine.Pool;
+using UnityEngine.Rendering;
+
+namespace UnityEditor.Build.Rendering
+{
+    class RenderPipelineGlobalSettingsStripper : IPreprocessBuildWithReport, IPostprocessBuildWithReport
+    {
+        public int callbackOrder => (int) ExecutionOrder.StripRenderPipelineGlobalSettingsAsset;
+
+        public void OnPreprocessBuild(BuildReport report)
+        {
+            var renderPipelineAssets = ListPool<RenderPipelineAsset>.Get();
+
+            var buildTargetGroupName = BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget).ToString();
+            QualitySettings.GetAllRenderPipelineAssetsForPlatform(buildTargetGroupName, ref renderPipelineAssets);
+
+            if (renderPipelineAssets.Count > 0 && renderPipelineAssets[0] != null)
+            {
+                // Top level stripping, even if there are multiple pipelines registered into the project, as we are building we are making sure the only one that is being transferred into the player is the current one.
+                GraphicsSettings.currentRenderPipelineGlobalSettings = EditorGraphicsSettings.GetSettingsForRenderPipeline(renderPipelineAssets[0].renderPipelineType);
+            }
+
+            ListPool<RenderPipelineAsset>.Release(renderPipelineAssets);
+        }
+
+        public void OnPostprocessBuild(BuildReport report)
+        {
+            GraphicsSettings.currentRenderPipelineGlobalSettings = null;
+        }
+    }
+}

Editor/Mono/BuildTarget.cs

@@ -140,6 +140,8 @@ public enum BuildTarget
 
         QNX = 46,
 
+        Bratwurst = 47,
+
         // obsolete identifiers. We're using different values so that ToString() works.
         [System.Obsolete("Use iOS instead (UnityUpgradable) -> iOS", true)]
         iPhone = -1,

Editor/Mono/BuildTargetGroup.cs

@@ -115,5 +115,7 @@ public enum BuildTargetGroup
         EmbeddedLinux = 34,
 
         QNX = 35,
+
+        Bratwurst = 36,
     }
 }

Editor/Mono/ContainerWindow.cs

@@ -44,6 +44,8 @@ internal partial class ContainerWindow : ScriptableObject
         private static ContainerWindow s_MainWindow;
         static internal ContainerWindow mainWindow { get => s_MainWindow; }
 
+        static readonly string s_ContextMenuID = "UnityEditor.UIElements.EditorMenuExtensions+ContextMenu";
+
         private static class Styles
         {
             public static float borderSize => macEditor ? osxBorderSize : winBorderSize;
@@ -490,7 +492,7 @@ public bool IsMainWindow()
         internal void SaveGeometry()
         {
             string ID = windowID;
-            if (String.IsNullOrEmpty(ID))
+            if (string.IsNullOrEmpty(ID))
                 return;
 
             // save position/size
@@ -507,10 +509,16 @@ public void Save()
             SaveGeometry();
         }
 
+        bool IsValidContextMenu()
+        {
+            return string.Equals(s_ContextMenuID, windowID) && m_PixelRect.x == 0 && m_PixelRect.y == 0;
+        }
+
         internal void LoadGeometry(bool loadPosition)
         {
             string ID = windowID;
-            if (String.IsNullOrEmpty(ID))
+            // Check for invalid ID and validate context menu to avoid soft locks on invalid positions UW-105
+            if (string.IsNullOrEmpty(ID) || IsValidContextMenu())
                 return;
 
             // get position/size