Unity 6000.0.9f1 C# reference source code

Author: Unity Technologies

Editor/Mono/AssetPipeline/SpeedTree/SpeedTree9Importer.cs

@@ -287,13 +287,13 @@ static ulong CombineHash(ulong h1, ulong h2)
         static ulong ComputeDefaultShaderHash()
         {
             ulong newDefaultShaderHash = 0UL;
-            if (GraphicsSettings.currentRenderPipeline == null || GraphicsSettings.currentRenderPipeline.defaultSpeedTree9Shader == null)
+            if (GraphicsSettings.GetDefaultShader(DefaultShaderType.SpeedTree9) == null)
             {
                 newDefaultShaderHash = 0;
             }
             else
             {
-                if (AssetDatabase.TryGetGUIDAndLocalFileIdentifier(GraphicsSettings.currentRenderPipeline.defaultSpeedTree9Shader, out var guid,
+                if (AssetDatabase.TryGetGUIDAndLocalFileIdentifier(GraphicsSettings.GetDefaultShader(DefaultShaderType.SpeedTree9), out var guid,
                         out long fileId))
                 {
                     newDefaultShaderHash = CombineHash((ulong)guid.GetHashCode(), (ulong)fileId);
@@ -1382,12 +1382,7 @@ private bool TreeHasFacingData()
 
         internal static bool TryGetShaderForCurrentRenderPipeline(out Shader shader)
         {
-            shader = null;
-            if (GraphicsSettings.currentRenderPipeline != null)
-            {
-                shader = GraphicsSettings.currentRenderPipeline.defaultSpeedTree9Shader;
-            }
-
+            shader = GraphicsSettings.GetDefaultShader(DefaultShaderType.SpeedTree9);
             if (shader == null)
             {
                 shader = Shader.Find(ImporterSettings.kLegacyShaderName);
@@ -1522,7 +1517,7 @@ private static bool TryGetHashSpeedTreeAttributeMaterialSettings(out List<string
         private static void ChangeTextureImporterSettingsForSt9Files(string assetPath)
         {
             SpeedTree9Reader tree = new SpeedTree9Reader();
-            
+
             FileStatus status = tree.Initialize(assetPath);
             if (status != FileStatus.Valid)
             {

Editor/Mono/BuildTargetDiscovery.bindings.cs

@@ -479,7 +479,7 @@ internal static bool DoesBuildTargetSupportSinglePassStereoRendering(BuildTarget
             {  s_platform_05, "Windows" },
             {  s_platform_09, "iOS" },
             {  s_platform_13, "Android™" },
-            {  s_platform_20, "WebGL" },
+            {  s_platform_20, "Web" },
             {  s_platform_21, "Universal Windows Platform" },
             {  s_platform_24, "Linux" },
             {  s_platform_31, "PlayStation®4" },

Editor/Mono/GI/InputExtraction.bindings.cs

@@ -70,8 +70,12 @@ internal static class BindingsMarshaller
 
         public static extern bool ExtractFromScene(string outputFolderPath, LightBaker.BakeInput input, LightBaker.LightmapRequests lightmapRequests, LightBaker.LightProbeRequests lightProbeRequests, SourceMap map);
 
+        [NativeMethod(IsThreadSafe = true)]
         public static extern int[] ComputeOcclusionLightIndicesFromBakeInput(LightBaker.BakeInput bakeInput, UnityEngine.Vector3[] probePositions, uint maxLightsPerProbe);
 
+        [NativeMethod(IsThreadSafe = true)]
+        public static extern int[] GetShadowmaskChannelsFromLightIndices(LightBaker.BakeInput bakeInput, int[] lightIndices);
+
         private static string LookupGameObjectName(SourceMap map, int instanceIndex)
         {
             if (map == null)

Editor/Mono/GI/InputExtraction.cs

@@ -61,5 +61,10 @@ public static int[] ComputeOcclusionLightIndicesFromBakeInput(BakeInput bakeInpu
         {
             return UnityEditor.LightBaking.InputExtraction.ComputeOcclusionLightIndicesFromBakeInput(bakeInput.bakeInput, probePositions, maxLightsPerProbe);
         }
+
+        public static int[] GetShadowmaskChannelsFromLightIndices(BakeInput bakeInput, int[] lightIndices)
+        {
+            return UnityEditor.LightBaking.InputExtraction.GetShadowmaskChannelsFromLightIndices(bakeInput.bakeInput, lightIndices);
+        }
     }
 }

Editor/Mono/SceneHierarchy.cs

@@ -1591,7 +1591,7 @@ internal void CreateSceneHeaderContextClick(GenericMenu menu, Scene scene)
 
             // Ping Scene Asset
             menu.AddSeparator("");
-            var selectAssetContent = EditorGUIUtility.TrTextContent("Find in project");
+            var selectAssetContent = EditorGUIUtility.TrTextContent("Find In Project");
             if (!string.IsNullOrEmpty(scene.path))
                 menu.AddItem(selectAssetContent, false, SelectSceneAsset, scene);
             else

Editor/Mono/Shaders/ShaderKeywordFilterData.cs

@@ -233,26 +233,35 @@ internal static SettingsNode GatherFilterData(string nodeName, object containerO
                 {
                     var enumerable = value as IEnumerable;
 
-                    bool hasDifferentChildren = (node != null) && (node.m_Children.Count > 0);
-                    foreach (var e in enumerable)
+                    // UUM-72309 - A crash occured due to a third party package throwing when accessing its enumerator.
+                    // This try/catch should prevent such issues and log an error.
+                    try
                     {
-                        var childVisited = new HashSet<object>(visited);
-                        SettingsNode newBranch = GatherFilterData(f.Name, e, childVisited, containerConstraints);
-                        if (newBranch != null)
+                        bool hasDifferentChildren = (node != null) && (node.m_Children.Count > 0);
+                        foreach (var e in enumerable)
                         {
-                            if (node == null)
-                                node = new SettingsNode(nodeName);
-
-                            if (hasDifferentChildren)
+                            var childVisited = new HashSet<object>(visited);
+                            SettingsNode newBranch = GatherFilterData(f.Name, e, childVisited, containerConstraints);
+                            if (newBranch != null)
                             {
-                                Debug.LogError("ShaderKeywordFilter attributes cannot be placed on a settings tree with multiple different branches on the same level.");
-                            }
-                            else
-                            {
-                                node.m_Children.Add(newBranch);
+                                if (node == null)
+                                    node = new SettingsNode(nodeName);
+
+                                if (hasDifferentChildren)
+                                {
+                                    Debug.LogError("ShaderKeywordFilter attributes cannot be placed on a settings tree with multiple different branches on the same level.");
+                                }
+                                else
+                                {
+                                    node.m_Children.Add(newBranch);
+                                }
                             }
                         }
                     }
+                    catch(Exception ex)
+                    {
+                        Debug.LogError($"An error occured while processing ShaderKeywordFilter attributes; Reading node: {nodeName} and field: {f.Name}\n {ex.Message}");
+                    }
                 }
                 else if (!type.IsValueType || (type.IsValueType && !type.IsPrimitive && !type.IsEnum)) // class or struct
                 {

Editor/Mono/SpeedTreeMaterialFixer.cs

@@ -46,13 +46,11 @@ public static void DoFixerUI(GameObject gameObject)
             if (s_Styles == null)
                 s_Styles = new Styles();
 
-            var srpAsset = GraphicsSettings.currentRenderPipeline;
-
-            var defaultSpeedTree8Shader = srpAsset != null ? srpAsset.defaultSpeedTree8Shader : null;
+            var defaultSpeedTree8Shader = GraphicsSettings.GetDefaultShader(DefaultShaderType.SpeedTree8);
             if (defaultSpeedTree8Shader == null)
                 defaultSpeedTree8Shader = Shader.Find("Nature/SpeedTree8");
 
-            var defaultSpeedTree7Shader = srpAsset != null ? srpAsset.defaultSpeedTree7Shader : null;
+            var defaultSpeedTree7Shader = GraphicsSettings.GetDefaultShader(DefaultShaderType.SpeedTree7);
             if (defaultSpeedTree7Shader == null)
                 defaultSpeedTree7Shader = Shader.Find("Nature/SpeedTree");
 

Modules/Audio/Public/ScriptBindings/Audio.bindings.cs

@@ -728,8 +728,11 @@ extern public int timeSamples
         }
 
         // The default [[AudioClip]] to play
-        [NativeProperty("AudioClip")]
-        extern public AudioClip clip { get; set; }
+        public AudioClip clip
+        {
+            get => resource as AudioClip;
+            set => resource = value as AudioClip;
+        }
 
         extern public AudioResource resource { get; set; }
 

Modules/BuildProfileEditor/Handlers/BuildProfileDataSource.cs

@@ -20,7 +20,14 @@ internal class BuildProfileDataSource : IDisposable
 
         const string k_AssetFolderPath = "Assets/Settings/Build Profiles";
 
-        static string GetNewProfileName(string displayName) => $"{k_AssetFolderPath}/{displayName}.asset";
+        static string GetDefaultNewProfilePath(string platformDisplayName) =>
+            $"{k_AssetFolderPath}/New {platformDisplayName} Profile.asset";
+
+        static string GetDefaultNewProfilePath(GUID platformGuid)
+        {
+            var platformDisplayName = BuildProfileModuleUtil.GetClassicPlatformDisplayName(platformGuid.ToString());
+            return GetDefaultNewProfilePath(platformDisplayName);
+        }
 
         internal BuildProfileDataSource(BuildProfileWindow window)
         {
@@ -86,14 +93,13 @@ internal List<BuildProfile> DuplicateProfiles(List<BuildProfile> profilesToDupli
         }
 
         /// <summary>
-        /// Create a custom build profile asset, making sure to create the folders
-        /// if needed
+        /// Create a new custom build profile asset with the default name.
+        /// Ensure that custom build profile folders is created if it doesn't already exist.
         /// </summary>
-        internal static void CreateAsset(string platformId, string displayName)
+        internal static void CreateNewAsset(string platformId, string platformDisplayName)
         {
-            CheckCreateCustomBuildProfileFolders();
-
-            BuildProfile.CreateInstance(platformId, GetNewProfileName(displayName));
+            EnsureCustomBuildProfileFolderExists();
+            BuildProfile.CreateInstance(platformId, GetDefaultNewProfilePath(platformDisplayName));
         }
 
         /// <summary>
@@ -105,7 +111,7 @@ internal static BuildProfile DuplicateAsset(BuildProfile buildProfile, bool isCl
             if (buildProfile == null)
                 return null;
 
-            string path = isClassic ? GetDuplicatedBuildProfilePathForClassic(buildProfile) : AssetDatabase.GetAssetPath(buildProfile);
+            string path = isClassic ? GetDefaultNewProfilePath(new GUID(buildProfile.platformId)) : AssetDatabase.GetAssetPath(buildProfile);
             if (string.IsNullOrEmpty(path))
                 return null;
 
@@ -116,7 +122,7 @@ internal static BuildProfile DuplicateAsset(BuildProfile buildProfile, bool isCl
             if (isClassic)
                 duplicatedProfile.scenes = EditorBuildSettings.GetEditorBuildSettingsSceneIgnoreProfile();
 
-            CheckCreateCustomBuildProfileFolders();
+            EnsureCustomBuildProfileFolderExists();
 
             string uniqueFilePath = AssetDatabase.GenerateUniqueAssetPath(path);
             AssetDatabase.CreateAsset(duplicatedProfile, uniqueFilePath);
@@ -301,13 +307,7 @@ static string ReplaceFileNameInPath(string originalPath, string newName)
             return Path.Combine(directory, $"{newName}{extension}");
         }
 
-        static string GetDuplicatedBuildProfilePathForClassic(BuildProfile buildProfile)
-        {
-            string name = BuildProfileModuleUtil.GetClassicPlatformDisplayName(buildProfile.platformId);
-            return Path.Combine(k_AssetFolderPath, $"{name}.asset");
-        }
-
-        static void CheckCreateCustomBuildProfileFolders()
+        static void EnsureCustomBuildProfileFolderExists()
         {
             if (!AssetDatabase.IsValidFolder("Assets/Settings"))
                 AssetDatabase.CreateFolder("Assets", "Settings");

Modules/BuildProfileEditor/PlatformDiscoveryWindow.cs

@@ -148,7 +148,7 @@ ListView CreateCardListView()
         /// </summary>
         static void OnAddBuildProfileClicked(BuildProfileCard card)
         {
-            BuildProfileDataSource.CreateAsset(card.platformId, card.displayName);
+            BuildProfileDataSource.CreateNewAsset(card.platformId, card.displayName);
             EditorAnalytics.SendAnalytic(new BuildProfileCreatedEvent(new BuildProfileCreatedEvent.Payload
             {
                 creationType = BuildProfileCreatedEvent.CreationType.PlatformBrowser,