Unity 6000.0.16f1 C# reference source code

Author: Unity Technologies

Editor/Mono/BuildProfile/BuildProfileContext.cs

@@ -166,7 +166,9 @@ internal static BuildProfileContext instance
             }
         }
 
-        internal IList<BuildProfile> classicPlatformProfiles
+        // Note: this has to be a serializable type such as List<T>, so that
+        // the references to classic build profiles survive domain reloads
+        internal List<BuildProfile> classicPlatformProfiles
         {
             [VisibleToOtherModules]
             get;
@@ -352,45 +354,58 @@ void OnEnable()
             EditorApplication.quitting -= SyncActiveProfileToFallback;
             EditorApplication.quitting += SyncActiveProfileToFallback;
 
-            classicPlatformProfiles = new List<BuildProfile>();
-
-            // Load platform build profiles from ProjectSettings folder.
-            if (!Directory.Exists(k_BuildProfilePath))
-                return;
-
-            var viewablePlatformKeys = BuildProfileModuleUtil.FindAllViewablePlatforms();
-            for (var index = 0; index < viewablePlatformKeys.Count; index++)
+            if (classicPlatformProfiles != null && classicPlatformProfiles.Count > 0)
             {
-                var key = viewablePlatformKeys[index];
-                string path = GetFilePathForBuildProfile(key);
+                // classicPlatformProfiles survived the domain reload - just readd them to the classic profile map
+                foreach (var profileObj in classicPlatformProfiles)
+                    m_PlatformIdToClassicPlatformProfile.Add(profileObj.platformId, profileObj);
+            }
+            else
+            {
+                // first load - populate classic profiles from disk
+                classicPlatformProfiles = new List<BuildProfile>();
 
-                if (!File.Exists(path) || !BuildProfileModuleUtil.IsModuleInstalled(key))
-                    continue;
+                // Load platform build profiles from ProjectSettings folder.
+                if (!Directory.Exists(k_BuildProfilePath))
+                    return;
 
-                var profile = InternalEditorUtility.LoadSerializedFileAndForget(path);
-                if (profile == null || profile.Length == 0 || profile[0] is not BuildProfile profileObj)
+                var viewablePlatformKeys = BuildProfileModuleUtil.FindAllViewablePlatforms();
+                for (var index = 0; index < viewablePlatformKeys.Count; index++)
                 {
-                    Debug.LogWarning($"Failed to load build profile from {path}.");
-                    continue;
-                }
+                    var key = viewablePlatformKeys[index];
+                    string path = GetFilePathForBuildProfile(key);
 
-                m_PlatformIdToClassicPlatformProfile.Add(profileObj.platformId, profileObj);
-                classicPlatformProfiles.Add(profileObj);
-            }
+                    if (!File.Exists(path) || !BuildProfileModuleUtil.IsModuleInstalled(key))
+                        continue;
 
-            if (!File.Exists(k_SharedProfilePath))
-                return;
+                    var profile = InternalEditorUtility.LoadSerializedFileAndForget(path);
+                    if (profile == null || profile.Length == 0 || profile[0] is not BuildProfile profileObj)
+                    {
+                        Debug.LogWarning($"Failed to load build profile from {path}.");
+                        continue;
+                    }
 
-            var sharedProfile = InternalEditorUtility.LoadSerializedFileAndForget(k_SharedProfilePath);
-            if (sharedProfile == null || sharedProfile.Length == 0 || sharedProfile[0] is not BuildProfile sharedProfileObj)
-            {
-                Debug.LogWarning($"Failed to load shared profile from {k_SharedProfilePath}.");
-                return;
+                    m_PlatformIdToClassicPlatformProfile.Add(profileObj.platformId, profileObj);
+                    classicPlatformProfiles.Add(profileObj);
+                }
             }
 
-            instance.sharedProfile = sharedProfileObj;
+            if (sharedProfile == null)
+            {
+                if (!File.Exists(k_SharedProfilePath))
+                    return;
+
+                var sharedProfileArray = InternalEditorUtility.LoadSerializedFileAndForget(k_SharedProfilePath);
+                if (sharedProfileArray == null || sharedProfileArray.Length == 0 || sharedProfileArray[0] is not BuildProfile sharedProfileObj)
+                {
+                    Debug.LogWarning($"Failed to load shared profile from {k_SharedProfilePath}.");
+                    return;
+                }
 
-            var buildProfile = instance.activeProfile ?? GetForClassicPlatform(EditorUserBuildSettings.activeBuildTarget, EditorUserBuildSettings.standaloneBuildSubtarget);
+                sharedProfile = sharedProfileObj;
+            }
+
+            var buildProfile = activeProfile ?? GetForClassicPlatform(EditorUserBuildSettings.activeBuildTarget, EditorUserBuildSettings.standaloneBuildSubtarget);
 
             // profile can be null if we're in the middle of creating classic profiles
             if (buildProfile == null)
@@ -689,6 +704,7 @@ static string GetLegacyFilePathForBuildProfile((string moduleName, StandaloneBui
         static void Save() => InternalEditorUtility.SaveToSerializedFileAndForget(new[] { instance },
             k_BuildProfileProviderAssetPath, true);
 
+        [VisibleToOtherModules]
         internal static bool IsSharedProfile(BuildTarget target) => target == BuildTarget.NoTarget;
     }
 }

Editor/Mono/EditorApplication.cs

@@ -278,6 +278,7 @@ public static event Action<PlayModeStateChange> playModeStateChanged
 
         // Global key up/down or mouse up/down/drag events that were not handled by anyone
         internal static CallbackFunction globalEventHandler;
+        internal static CallbackFunction shortcutHelperBarEventHandler;
 
         // Returns true when the pressed keys are defined in the Trigger
         internal static Func<bool> doPressedKeysTriggerAnyShortcut;
@@ -521,6 +522,7 @@ static bool DoPressedKeysTriggerAnyShortcutHandler()
         static void Internal_CallGlobalEventHandler()
         {
             globalEventHandler?.Invoke();
+            shortcutHelperBarEventHandler?.Invoke();
 
             // Ensure this is called last in order to make sure no null current events are passed to other handlers
             WindowLayout.MaximizeGestureHandler();

Editor/Mono/EditorGUIUtility.cs

@@ -963,7 +963,12 @@ public static GUIContent ObjectContent(UnityObject obj, Type type)
             return ObjectContent(obj, type, ReferenceEquals(obj, null) ? 0 : obj.GetInstanceID());
         }
 
-        internal static GUIContent ObjectContent(UnityObject obj, Type type, int instanceID)
+        internal static GUIContent ObjectContent(UnityObject obj, Type type, bool showNullIcon)
+        {
+            return ObjectContent(obj, type, ReferenceEquals(obj, null) ? 0 : obj.GetInstanceID(), showNullIcon);
+        }
+
+        internal static GUIContent ObjectContent(UnityObject obj, Type type, int instanceID, bool showNullIcon = true)
         {
             if (obj)
             {
@@ -973,7 +978,7 @@ internal static GUIContent ObjectContent(UnityObject obj, Type type, int instanc
             else if (type != null)
             {
                 s_ObjectContent.text = GetTypeNameWithInfo(type.Name, instanceID);
-                s_ObjectContent.image = null; // Do not show icon when the reference is null as the type is already included in the label (UUM-16396)
+                s_ObjectContent.image = showNullIcon ? AssetPreview.GetMiniTypeThumbnail(type) : null;
             }
             else
             {
@@ -1006,9 +1011,9 @@ internal static GUIContent ObjectContent(UnityObject obj, Type type, SerializedP
                 // from property.objectReferenceValue is not reliable, so we have to
                 // explicitly check property.objectReferenceInstanceIDValue if a property exists.
                 if (property != null && property.isValid)
-                    temp = ObjectContent(obj, type, property.objectReferenceInstanceIDValue);
+                    temp = ObjectContent(obj, type, property.objectReferenceInstanceIDValue, false);
                 else
-                    temp = ObjectContent(obj, type);
+                    temp = ObjectContent(obj, type, false);
             }
 
             if (property != null && property.isValid)

Editor/Mono/EditorSettings.bindings.cs

@@ -242,16 +242,18 @@ internal static extern string Internal_ProjectGenerationUserExtensions
         [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
         public static extern bool useLegacyProbeSampleCount { get; set; }
 
-        [Obsolete("EditorSettings.disableCookiesInLightmapper is obsolete, please use EditorSettings.enableCookiesInLightmapper instead.", false)]
-        [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
-        public static extern bool disableCookiesInLightmapper { get; set; }
+        [Obsolete("The disableCookiesInLightmapper setting is no longer supported. Cookies are always enabled in the Progressive Lightmapper.", true)]
+        public static bool disableCookiesInLightmapper
+        {
+            get { return false; }
+            set {}
+        }
 
+        [Obsolete("The enableCookiesInLightmapper setting is no longer supported. Cookies are always enabled in the Progressive Lightmapper.")]
         public static bool enableCookiesInLightmapper
         {
-#pragma warning disable 618
-            get { return !disableCookiesInLightmapper; }
-            set { disableCookiesInLightmapper = !value; }
-#pragma warning restore 618
+            get { return true; }
+            set {}
         }
 
         [Obsolete("Bake with the Progressive Lightmapper.The backend that uses Enlighten to bake is obsolete.", true)]

Editor/Mono/GI/InputExtraction.bindings.cs

@@ -110,28 +110,34 @@ public static string LogInstances(LightBaker.BakeInput bakeInput, SourceMap map)
                 else
                     message += $"         Instance [{i}] [{LookupGameObjectName(map, i)}]:\n";
                 LightBaker.Instance instance = bakeInput.instance((uint)i);
-                message += $"            mesh type\t\t: {instance.meshType}\n";
+                message += $"            mesh type\t\t\t: {instance.meshType}\n";
                 if (instance.meshType == LightBaker.MeshType.MeshRenderer)
-                    message += $"            mesh index\t: {instance.meshIndex}\n";
+                    message += $"            mesh index\t\t\t: {instance.meshIndex}\n";
                 else if (instance.meshType == LightBaker.MeshType.Terrain)
-                    message += $"            terrain index\t: {instance.terrainIndex}\n";
-                message += $"            transform\t\t: {instance.transform.GetRow(0)}\n";
-                message += $"                     \t\t: {instance.transform.GetRow(1)}\n";
-                message += $"                     \t\t: {instance.transform.GetRow(2)}\n";
-                message += $"                     \t\t: {instance.transform.GetRow(3)}\n";
-                message += $"            cast shadows\t: {instance.castShadows}\n";
+                    message += $"            terrain index\t\t: {instance.terrainIndex}\n";
+                message += $"            transform\t\t\t: {instance.transform.GetRow(0)}\n";
+                message += $"                     \t\t\t: {instance.transform.GetRow(1)}\n";
+                message += $"                     \t\t\t: {instance.transform.GetRow(2)}\n";
+                message += $"                     \t\t\t: {instance.transform.GetRow(3)}\n";
+                message += $"            cast shadows\t\t: {instance.castShadows}\n";
                 message += $"            receive shadows\t: {instance.receiveShadows}\n";
                 if (instance.meshType == LightBaker.MeshType.MeshRenderer)
                 {
-                    message += $"            odd negative scale\t: {instance.oddNegativeScale}\n";
-                    message += $"            lod group\t\t: {instance.lodGroup}\n";
-                    message += $"            lod mask\t\t: {instance.lodMask}\n";
+                    message += $"            odd neg scale\t\t: {instance.oddNegativeScale}\n";
+                    message += $"            lod group\t\t\t: {instance.lodGroup}\n";
+                    message += $"            lod mask\t\t\t\t: {instance.lodMask}\n";
                 }
-                message += $"            submesh count\t: {instance.submeshMaterialIndices.Length}\n";
+                message += $"            submesh count\t\t: {instance.submeshMaterialIndices.Length}\n";
                 string indices = string.Empty;
                 for (int j = 0; j < instance.submeshMaterialIndices.Length; ++j)
                     indices += instance.submeshMaterialIndices[j] + (j < (instance.submeshMaterialIndices.Length - 1) ? ", " : "");
                 message += $"            submesh mat idxs\t: {{{indices}}}\n";
+                message += $"            albedo tex idx\t\t: {bakeInput.instanceToAlbedoIndex((uint)i)}\n";
+                message += $"            emissive tex idx\t: {bakeInput.instanceToEmissiveIndex((uint)i)}\n";
+                string transmissiveIndices = string.Empty;
+                for (int j = 0; j < instance.submeshMaterialIndices.Length; ++j)
+                    transmissiveIndices += bakeInput.instanceToTransmissiveIndex((uint)i, (uint)j) + (j < (instance.submeshMaterialIndices.Length - 1) ? ", " : "");
+                message += $"            trans tex idxs\t\t: {{{transmissiveIndices}}}\n";
             }
             return message;
         }
@@ -141,13 +147,13 @@ public static string LogSceneMaterials(LightBaker.BakeInput bakeInput)
             if (bakeInput is null)
                 return string.Empty;
             string message = string.Empty;
-            message += $"      material count\t: {bakeInput.materialCount}\n";
+            message += $"      material count\t\t: {bakeInput.materialCount}\n";
             for (int i = 0; i < bakeInput.materialCount; ++i)
             {
                 message += $"         Material [{i}]:\n";
-                message += $"            doubleSidedGI\t: {bakeInput.GetMaterial((uint)i).doubleSidedGI}\n";
+                message += $"            doubleSidedGI\t\t\t: {bakeInput.GetMaterial((uint)i).doubleSidedGI}\n";
                 message += $"            transmissionChannels\t: {bakeInput.GetMaterial((uint)i).transmissionChannels}\n";
-                message += $"            transmissionType\t: {bakeInput.GetMaterial((uint)i).transmissionType}\n";
+                message += $"            transmissionType\t\t: {bakeInput.GetMaterial((uint)i).transmissionType}\n";
             }
             return message;
         }
@@ -181,22 +187,22 @@ public static string LogSceneLights(LightBaker.BakeInput bakeInput)
             {
                 LightBaker.Light light = bakeInput.GetLight((uint)i);
                 message += $"         Light [{i}]:\n";
-                message += $"            color\t\t: {light.color}\n";
-                message += $"            indirect color\t: {light.indirectColor}\n";
-                message += $"            orientation\t: {light.orientation}\n";
-                message += $"            position\t\t: {light.position}\n";
-                message += $"            range\t\t: {light.range}\n";
-                message += $"            cookie index\t: {light.cookieTextureIndex}\n";
-                message += $"            cookie scale\t: {light.cookieScale}\n";
-                message += $"            cone angle\t: {light.coneAngle}\n";
+                message += $"            color\t\t\t\t\t: {light.color}\n";
+                message += $"            indirect color\t\t: {light.indirectColor}\n";
+                message += $"            orientation\t\t\t: {light.orientation}\n";
+                message += $"            position\t\t\t\t: {light.position}\n";
+                message += $"            range\t\t\t\t\t: {light.range}\n";
+                message += $"            cookie index\t\t: {light.cookieTextureIndex}\n";
+                message += $"            cookie scale\t\t: {light.cookieScale}\n";
+                message += $"            cone angle\t\t\t: {light.coneAngle}\n";
                 message += $"            inner cone angle\t: {light.innerConeAngle}\n";
-                message += $"            shape0\t\t: {light.shape0}\n";
-                message += $"            shape1\t\t: {light.shape1}\n";
-                message += $"            type\t\t: {light.type}\n";
-                message += $"            mode\t\t: {light.mode}\n";
-                message += $"            falloff\t\t: {light.falloff}\n";
+                message += $"            shape0\t\t\t\t: {light.shape0}\n";
+                message += $"            shape1\t\t\t\t: {light.shape1}\n";
+                message += $"            type\t\t\t\t\t: {light.type}\n";
+                message += $"            mode\t\t\t\t\t: {light.mode}\n";
+                message += $"            falloff\t\t\t\t: {light.falloff}\n";
                 message += $"            angular falloff\t: {light.angularFalloff}\n";
-                message += $"            casts shadows\t: {light.castsShadows}\n";
+                message += $"            casts shadows\t\t: {light.castsShadows}\n";
                 message += $"            shadowmask chnl\t: {light.shadowMaskChannel}\n";
             }
             return message;
@@ -222,12 +228,12 @@ public static string LogSceneSettings(LightBaker.BakeInput bakeInput)
             message += LogSampleCounts(lightingSettings.lightmapSampleCounts);
             message += $"         lightprobe sample counts:\n";
             message += LogSampleCounts(lightingSettings.probeSampleCounts);
-            message += $"         min bounces\t: {lightingSettings.minBounces}\n";
-            message += $"         max bounces\t: {lightingSettings.maxBounces}\n";
+            message += $"         min bounces\t\t\t\t: {lightingSettings.minBounces}\n";
+            message += $"         max bounces\t\t\t\t: {lightingSettings.maxBounces}\n";
             message += $"         lightmap bake mode\t: {lightingSettings.lightmapBakeMode}\n";
             message += $"         mixed lighting mode\t: {lightingSettings.mixedLightingMode}\n";
-            message += $"         ao enabled\t\t: {lightingSettings.aoEnabled}\n";
-            message += $"         ao distance\t\t: {lightingSettings.aoDistance}\n";
+            message += $"         ao enabled\t\t\t\t: {lightingSettings.aoEnabled}\n";
+            message += $"         ao distance\t\t\t\t: {lightingSettings.aoDistance}\n";
             return message;
         }
 
@@ -238,10 +244,10 @@ public static string LogScene(LightBaker.BakeInput bakeInput, LightBaker.Lightma
             string message = string.Empty;
             message += LogSceneSettings(bakeInput);
             message += LogInstances(bakeInput, map);
-            message += $"      mesh count\t\t: {bakeInput.meshCount}\n";
+            message += $"      mesh count\t\t\t: {bakeInput.meshCount}\n";
             message += $"      terrain count\t\t: {bakeInput.terrainCount}\n";
             message += $"      heightmap count\t: {bakeInput.heightmapCount}\n";
-            message += $"      holemap count\t: {bakeInput.holemapCount}\n";
+            message += $"      holemap count\t\t: {bakeInput.holemapCount}\n";
             message += LogSceneMaterials(bakeInput);
             message += $"      albedo tex count\t: {bakeInput.albedoTextureCount}\n";
             for (int i = 0; i < bakeInput.albedoTextureCount; ++i)

Editor/Mono/GI/LightBaker.bindings.cs

@@ -754,6 +754,7 @@ public uint lightmapInstanceCount(uint index)
             extern uint Internal_LightmapHeight(uint index);
             extern uint Internal_InstanceCount(uint lightmapIndex);
             public extern void SetLightmapResolution(Resolution resolution);
+            public extern void SetSingleLightmapResolution(uint index, Resolution resolution);
             public Resolution lightmapResolution(uint index)
             {
                 if (index >= lightmapCount)