Unity 6000.0.0b15 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/CurveBindingUtility.cs

@@ -29,7 +29,10 @@ public static object GetCurrentValue(AnimationWindowState state, EditorCurveBind
         // Otherwise, evaluate AnimationWindowCurve at current time.
         public static object GetCurrentValue(AnimationWindowState state, AnimationWindowCurve curve)
         {
-            if (state.previewing && curve.rootGameObject != null)
+            // UUM-66112 - state.linkedWithSequencer - Padding for issue in Timeline where muscle
+            // values are not updated in the editor when previewing in the Animation Window.
+            // Fallback to curve values.
+            if (state.previewing && curve.rootGameObject != null && !state.linkedWithSequencer)
             {
                 return GetCurrentValue(state, curve.binding);
             }

Editor/Mono/Annotation/SceneRenderModeWindow.cs

@@ -163,7 +163,7 @@ private float windowHeight
                 modes = Styles.sBuiltinCameraModes.Count(mode => m_SceneView.IsCameraDrawModeSupported(mode) && mode.show) +
                         SceneView.userDefinedModes.Count(mode => m_SceneView.IsCameraDrawModeSupported(mode) && mode.show);
 
-                return UpdatedHeight(headers, modes, GraphicsSettings.renderPipelineAsset != null);
+                return UpdatedHeight(headers, modes, GraphicsSettings.isScriptableRenderPipelineEnabled);
             }
         }
 
@@ -295,7 +295,7 @@ private void Draw(float listElementWidth)
                 }
             }
 
-            if (GraphicsSettings.renderPipelineAsset != null)
+            if (GraphicsSettings.isScriptableRenderPipelineEnabled)
             {
                 DrawSeparator(ref drawPos);
                 DrawRenderingDebuggerShortCut(drawPos);
@@ -339,7 +339,7 @@ private float RecalculateWindowHeight()
                 }
             }
 
-            return UpdatedHeight(headers, modes, GraphicsSettings.renderPipelineAsset != null);
+            return UpdatedHeight(headers, modes, GraphicsSettings.isScriptableRenderPipelineEnabled);
         }
 
         private float UpdatedHeight(int headers, int modes, bool isSRP)

Editor/Mono/AssemblyInfo/AssemblyInfo.cs

@@ -153,6 +153,8 @@
 [assembly: InternalsVisibleTo("Unity.Muse.Common.Bridge")]
 [assembly: InternalsVisibleTo("Unity.Muse.Chat.Bridge")]
 
+[assembly: InternalsVisibleTo("Unity.Multiplayer.Playmode.Editor.Bridge")]
+
 [assembly: InternalsVisibleTo("Unity.Scenes")]
 
 // This should move with the AnimationWindow to a module at some point

Editor/Mono/AssetPipeline/TextureGenerator.bindings.cs

@@ -248,11 +248,16 @@ public static unsafe class TextureGenerator
     {
         public static TextureGenerationOutput GenerateTexture(TextureGenerationSettings settings, NativeArray<Color32> colorBuffer)
         {
-            return GenerateTextureImpl(settings, colorBuffer.GetUnsafeReadOnlyPtr(), colorBuffer.Length * UnsafeUtility.SizeOf<Color32>());
+            return GenerateTextureImpl(settings, colorBuffer.GetUnsafeReadOnlyPtr(), colorBuffer.Length * UnsafeUtility.SizeOf<Color32>(), 4);
+        }
+        
+        public static TextureGenerationOutput GenerateTexture(TextureGenerationSettings settings, NativeArray<Color> colorBuffer)
+        {
+            return GenerateTextureImpl(settings, colorBuffer.GetUnsafeReadOnlyPtr(), colorBuffer.Length * UnsafeUtility.SizeOf<Color>(), 16);
         }
 
         [NativeThrows]
         [NativeMethod("GenerateTextureScripting")]
-        extern static unsafe TextureGenerationOutput GenerateTextureImpl(TextureGenerationSettings settings, void* colorBuffer, int colorBufferLength);
+        extern static unsafe TextureGenerationOutput GenerateTextureImpl(TextureGenerationSettings settings, void* colorBuffer, int colorBufferLength, int bytesPerPixel);
     }
 }

Editor/Mono/Audio/AudioContainerWindow.cs

@@ -232,6 +232,7 @@ void CreateGUI()
 
                 m_Day0RootVisualElement.style.display = DisplayStyle.None;
                 m_ContainerRootVisualElement.style.display = DisplayStyle.Flex;
+                m_CachedElements = State.AudioContainer.elements.ToList();
                 m_ClipsListView.Rebuild(); // Force a list rebuild when the list has changed or it will not always render correctly due to a UI toolkit bug.
             }
         }
@@ -519,12 +520,14 @@ void OnVolumeRandomizationEnabledChanged(SerializedProperty property)
             m_VolumeRandomizationButtonImage.style.backgroundImage = new StyleBackground(m_DiceIconOn);
             m_VolumeRandomizationRangeSlider.SetEnabled(true);
             m_VolumeRandomizationRangeField.SetEnabled(true);
+            m_VolumeRandomRangeTracker.SetEnabled(true);
         }
         else
         {
             m_VolumeRandomizationButtonImage.style.backgroundImage = new StyleBackground(m_DiceIconOff);
             m_VolumeRandomizationRangeSlider.SetEnabled(false);
             m_VolumeRandomizationRangeField.SetEnabled(false);
+            m_VolumeRandomRangeTracker.SetEnabled(false);
         }
     }
 
@@ -624,12 +627,14 @@ void OnPitchRandomizationEnabledChanged(SerializedProperty property)
             m_PitchRandomizationButtonImage.style.backgroundImage = new StyleBackground(m_DiceIconOn);
             m_PitchRandomizationRangeSlider.SetEnabled(true);
             m_PitchRandomizationRangeField.SetEnabled(true);
+            m_PitchRandomRangeTracker.SetEnabled(true);
         }
         else
         {
             m_PitchRandomizationButtonImage.style.backgroundImage = new StyleBackground(m_DiceIconOff);
             m_PitchRandomizationRangeSlider.SetEnabled(false);
             m_PitchRandomizationRangeField.SetEnabled(false);
+            m_PitchRandomRangeTracker.SetEnabled(false);
         }
     }
 
@@ -1190,12 +1195,14 @@ void OnTimeRandomizationEnabledChanged(SerializedProperty property)
             m_TimeRandomizationButtonImage.style.backgroundImage = new StyleBackground(m_DiceIconOn);
             m_TimeRandomizationRangeSlider.SetEnabled(true);
             m_TimeRandomizationRangeField.SetEnabled(true);
+            m_TimeRandomRangeTracker.SetEnabled(true);
         }
         else
         {
             m_TimeRandomizationButtonImage.style.backgroundImage = new StyleBackground(m_DiceIconOff);
             m_TimeRandomizationRangeSlider.SetEnabled(false);
             m_TimeRandomizationRangeField.SetEnabled(false);
+            m_TimeRandomRangeTracker.SetEnabled(false);
         }
     }
 

Editor/Mono/Audio/UIElements/AudioRandomRangeSliderTracker.cs

@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Transactions;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -16,11 +17,12 @@ class AudioRandomRangeSliderTracker : VisualElement
         public override object CreateInstance() => new AudioRandomRangeSliderTracker();
     }
 
-    static readonly CustomStyleProperty<Color> s_TrackerColorProperty = new("--tracker-color");
+    static readonly CustomStyleProperty<Color> s_TrackerEnabledColorProperty = new("--tracker-color");
 
     Slider m_ParentSlider;
     Vector2 m_Range = Vector2.zero;
-    Color m_TrackerColor;
+    Color m_TrackerEnabledColor;
+    Color m_TrackerDisabledColor = Color.gray;
 
     static void CustomStylesResolved(CustomStyleResolvedEvent evt)
     {
@@ -31,9 +33,9 @@ static void CustomStylesResolved(CustomStyleResolvedEvent evt)
 
     void UpdateCustomStyles()
     {
-        if (customStyle.TryGetValue(s_TrackerColorProperty, out var trackerColor))
+        if (customStyle.TryGetValue(s_TrackerEnabledColorProperty, out var trackerColor))
         {
-            m_TrackerColor = trackerColor;
+            m_TrackerEnabledColor = trackerColor;
         }
     }
 
@@ -54,6 +56,7 @@ internal static AudioRandomRangeSliderTracker Create(Slider parentSlider, Vector
         rangeTracker.generateVisualContent += GenerateVisualContent;
         rangeTracker.RegisterCallback<CustomStyleResolvedEvent>(CustomStylesResolved);
         rangeTracker.m_ParentSlider.RegisterCallback<GeometryChangedEvent>(OnGeometryChanged);
+        rangeTracker.RegisterCallback<PropertyChangedEvent>(OnPropertyChanged);
 
         return rangeTracker;
     }
@@ -72,6 +75,16 @@ static void OnGeometryChanged(GeometryChangedEvent evt)
         sliderTracker.SetRange(sliderTracker.m_Range);
     }
 
+    static void OnPropertyChanged(PropertyChangedEvent evt)
+    {
+        var sliderTracker = evt.elementTarget;
+
+        if (evt.property == "enabledSelf")
+        {
+            sliderTracker.MarkDirtyRepaint();
+        }
+    }
+
     // Maps 'x' from the range '[x_min; x_max]' to the range '[y_min; y_max]'.
     static float Map(float x, float x_min, float x_max, float y_min, float y_max)
     {
@@ -102,7 +115,7 @@ static void GenerateVisualContent(MeshGenerationContext context)
         right = Mathf.Clamp(right, contentRect.xMin, contentRect.xMax);
 
         // Draw the tracker.
-        painter2D.fillColor = sliderTracker.m_TrackerColor;
+        painter2D.fillColor = sliderTracker.enabledSelf ? sliderTracker.m_TrackerEnabledColor : sliderTracker.m_TrackerDisabledColor;
         painter2D.BeginPath();
         painter2D.MoveTo(new Vector2(left, contentRect.yMin));
         painter2D.LineTo(new Vector2(right, contentRect.yMin));

Editor/Mono/BaseBuildTarget.cs

@@ -18,6 +18,8 @@ internal abstract class BaseBuildTarget : IBuildTarget
 
     public abstract RuntimePlatform RuntimePlatform { get; }
     public abstract string TargetName { get; }
+    public abstract GUID Guid { get; }
+
     public abstract int GetLegacyId { get; }
 
     public virtual IBuildPlatformProperties BuildPlatformProperties => Properties as IBuildPlatformProperties;

Editor/Mono/BuildPipeline/BuildPlatform.cs

@@ -132,29 +132,10 @@ public string GetBuildTargetDisplayName(NamedBuildTarget namedBuildTarget, Build
             }
 
             var suffix = namedBuildTarget == NamedBuildTarget.Server ? " Server" : "";
-
-            switch (target)
-            {
-                case BuildTarget.StandaloneWindows:
-                case BuildTarget.StandaloneWindows64:
-                    return $"Windows{suffix}";
-                case BuildTarget.StandaloneOSX:
-                    // Deprecated
-#pragma warning disable 612, 618
-                case BuildTarget.StandaloneOSXIntel:
-                case BuildTarget.StandaloneOSXIntel64:
-#pragma warning restore 612, 618
-                    return $"macOS{suffix}";
-                    // Deprecated
-#pragma warning disable 612, 618
-                case BuildTarget.StandaloneLinux:
-                case BuildTarget.StandaloneLinuxUniversal:
-#pragma warning restore 612, 618
-                case BuildTarget.StandaloneLinux64:
-                    return $"Linux{suffix}";
-            }
-
-            return "Unsupported Target";
+#pragma warning disable CS0618 // Member is obsolete
+            string targetName = BuildTargetDiscovery.BuildPlatformDisplayName(target) + suffix;
+#pragma warning restore CS0618
+            return targetName.Length == 0 ? "Unsupported Target" : targetName;
         }
 
         public string GetModuleDisplayName(NamedBuildTarget namedBuildTarget, BuildTarget buildTarget)

Editor/Mono/BuildPipeline/DataBuildDirtyTracker.cs

@@ -39,6 +39,7 @@ class BuildData
         {
             public BuildDataInputFile[] scenes;
             public BuildDataInputFile[] inputFiles;
+            public BuildDataInputFile activeBuildProfile;
             public string[] enabledModules;
             public string[] resourcePaths;
             public BuildOptions buildOptions;
@@ -54,6 +55,7 @@ class BuildData
 
         private BuildData buildData;
         private string[] scenes;
+        private NPath activeBuildProfilePath;
         public BuildOptions buildOptions;
 
         bool CheckAssetDirty(BuildDataInputFile file)
@@ -135,12 +137,18 @@ bool DoCheckDirty()
                 return true;
             }
 
+            if ((activeBuildProfilePath != buildData.activeBuildProfile.path) || (!string.IsNullOrEmpty(buildData.activeBuildProfile.path) && CheckAssetDirty(buildData.activeBuildProfile)))
+            {
+                Console.WriteLine($"Rebuilding Data files because the active build profile have changed");
+                return true;
+            }
+
             Console.WriteLine("Not rebuilding Data files -- no changes");
             return false;
         }
 
         [RequiredByNativeCode]
-        static public void WriteBuildData(string buildDataPath, BuildReport report, string[] scenes, string[] prefabs)
+        static public void WriteBuildData(string buildDataPath, BuildReport report, string[] scenes, string[] prefabs, string activeBuildProfilePath)
         {
             var developmentBuild = report.summary.options.HasFlag(BuildOptions.Development);
             var inputScenes = new List<BuildDataInputFile>();
@@ -164,6 +172,7 @@ static public void WriteBuildData(string buildDataPath, BuildReport report, stri
             {
                 scenes = inputScenes.ToArray(),
                 inputFiles = inputFiles.ToArray(),
+                activeBuildProfile = new BuildDataInputFile(activeBuildProfilePath, developmentBuild),
                 buildOptions = report.summary.options & BuildData.BuildOptionsMask,
                 unityVersion = Application.unityVersion,
                 resourcePaths = ResourcesAPIInternal.GetAllPaths("").OrderBy(p => p).ToArray(),
@@ -175,7 +184,7 @@ static public void WriteBuildData(string buildDataPath, BuildReport report, stri
         }
 
         [RequiredByNativeCode]
-        static public bool CheckDirty(string buildDataPath, BuildOptions buildOptions, string[] scenes)
+        static public bool CheckDirty(string buildDataPath, BuildOptions buildOptions, string[] scenes, string activeBuildProfilePath)
         {
             NPath buildReportPath = buildDataPath;
             if (!buildReportPath.FileExists())
@@ -187,6 +196,7 @@ static public bool CheckDirty(string buildDataPath, BuildOptions buildOptions, s
                 {
                     buildData = JsonUtility.FromJson<BuildData>(buildReportPath.ReadAllText()),
                     scenes = scenes,
+                    activeBuildProfilePath = activeBuildProfilePath,
                     buildOptions = buildOptions
                 };
                 return tracker.DoCheckDirty();

Editor/Mono/BuildPlayerWindow.cs

@@ -582,7 +582,9 @@ static bool IsVirtualTexturingSettingsValid(BuildPlatform platform)
         };
         static public string GetPlaybackEngineDownloadURL(string moduleName)
         {
-            if (moduleName == "PS4" || moduleName == "PS5" || moduleName == "XboxOne")
+#pragma warning disable CS0618 // Member is obsolete
+            if (!BuildTargetDiscovery.BuildPlatformCanBeInstalledWithHub(BuildTargetDiscovery.GetBuildTargetByName(moduleName)))
+#pragma warning restore CS0618
                 return "https://unity3d.com/platform-installation";
 
             string fullVersion = InternalEditorUtility.GetFullUnityVersion();
@@ -958,8 +960,9 @@ internal static void ShowNoModuleLabel(
         {
             GUILayout.Label(EditorGUIUtility.TextContent(string.Format(noModuleLoaded, BuildPlatforms.instance.GetModuleDisplayName(namedBuildTarget, buildTarget))));
             string url = "";
-
-            if (!isEditorinstalledWithHub || (moduleName == "PS4" || moduleName == "PS5" || moduleName == "XboxOne"))
+#pragma warning disable CS0618 // Member is obsolete
+            if (!isEditorinstalledWithHub || !BuildTargetDiscovery.BuildPlatformCanBeInstalledWithHub(buildTarget))
+#pragma warning restore CS0618
             {
                 if (GUILayout.Button(openDownloadPage, EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
                 {