Unity 6000.0.22f1 C# reference source code

Editor/Mono/BuildProfile/BuildProfile.cs

@@ -22,6 +22,12 @@ namespace UnityEditor.Build.Profile
     [HelpURL("build-profiles-reference")]
     public sealed partial class BuildProfile : ScriptableObject
     {
+        /// <summary>
+        /// Asset Schema Version
+        /// </summary>
+        [SerializeField]
+        uint m_AssetVersion = 1;
+
         /// <summary>
         /// Build Target used to fetch module and build profile extension.
         /// </summary>
@@ -78,6 +84,17 @@ internal BuildProfilePlatformSettingsBase platformBuildProfile
             set => m_PlatformBuildProfile = value;
         }
 
+        /// <summary>
+        /// When set, this build profiles <see cref="scenes"/> used when building.
+        /// </summary>
+        /// <seealso cref="EditorBuildSettings"/>
+        [SerializeField] private bool m_OverrideGlobalSceneList = false;
+        internal bool overrideGlobalSceneList
+        {
+            get => m_OverrideGlobalSceneList;
+            set => m_OverrideGlobalSceneList = value;
+        }
+
         /// <summary>
         /// List of scenes specified in the build profile.
         /// </summary>
@@ -97,7 +114,7 @@ public EditorBuildSettingsScene[] scenes
                 m_Scenes = value;
                 CheckSceneListConsistency();
 
-                if (this == BuildProfileContext.activeProfile)
+                if (this == BuildProfileContext.activeProfile && m_OverrideGlobalSceneList)
                     EditorBuildSettings.SceneListChanged();
             }
         }
@@ -202,7 +219,7 @@ void OnEnable()
 
         void OnDisable()
         {
-            if (IsActiveBuildProfileOrPlatform())
+            if (BuildProfileContext.activeProfile == this)
                 EditorUserBuildSettings.SetActiveProfileScriptingDefines(m_ScriptingDefines);
 
             var playerSettingsDirty = EditorUtility.IsDirty(m_PlayerSettings);

Editor/Mono/BuildTargetDiscovery.bindings.cs

@@ -349,7 +349,6 @@ internal static bool DoesBuildTargetSupportSinglePassStereoRendering(BuildTarget
             s_platform_43,
             s_platform_45,
             s_platform_46,
-            s_platform_47,
             s_platform_48,
         };
 

Editor/Mono/EditorBuildSettings.bindings.cs

@@ -86,7 +86,8 @@ public static EditorBuildSettingsScene[] scenes
         {
             get
             {
-                if (BuildProfileContext.activeProfile is not null)
+                if (BuildProfileContext.activeProfile is not null
+                    && BuildProfileContext.activeProfile.overrideGlobalSceneList)
                 {
                     return BuildProfileContext.activeProfile.scenes;
                 }
@@ -95,7 +96,8 @@ public static EditorBuildSettingsScene[] scenes
             }
             set
             {
-                if (BuildProfileContext.activeProfile is not null)
+                if (BuildProfileContext.activeProfile is not null
+                    && BuildProfileContext.activeProfile.overrideGlobalSceneList)
                 {
                     BuildProfileContext.activeProfile.scenes = value;
                 }
@@ -109,7 +111,9 @@ public static EditorBuildSettingsScene[] scenes
         [RequiredByNativeCode]
         static EditorBuildSettingsScene[] GetActiveBuildProfileSceneList()
         {
-            if (!EditorUserBuildSettings.isBuildProfileAvailable || BuildProfileContext.activeProfile is null)
+            if (!EditorUserBuildSettings.isBuildProfileAvailable
+                || BuildProfileContext.activeProfile is null
+                || !BuildProfileContext.activeProfile.overrideGlobalSceneList)
                 return null;
 
             return BuildProfileContext.activeProfile.scenes;

Editor/Mono/EditorWindow.cs

@@ -1081,6 +1081,12 @@ public void Close()
             if (WindowLayout.IsMaximized(this))
                 WindowLayout.Unmaximize(this);
 
+            // [UUM-58449] If the focused window got closed, reset the IME composition mode to the default value. The normal codepaths may not run since this object is immediately destroyed.
+            if (focusedWindow == this)
+            {
+                GUIUtility.imeCompositionMode = IMECompositionMode.Auto;
+            }
+
             DockArea da = m_Parent as DockArea;
             if (da)
             {

Editor/Mono/GI/Lightmapping.bindings.cs

@@ -100,6 +100,13 @@ public enum GIWorkflowMode
             Legacy = 2
         }
 
+        [NativeHeader("Runtime/Graphics/LightmapSettings.h")]
+        public enum BakeOnSceneLoadMode
+        {
+            Never = 0,
+            IfMissingLightingData = 1,
+        };
+
         // Obsolete, please use Actions instead
         public delegate void OnStartedFunction();
         public delegate void OnCompletedFunction();
@@ -447,6 +454,9 @@ public static void Tetrahedralize(Vector3[] positions, out int[] outIndices, out
         [FreeFunction]
         public static extern void GetTerrainGIChunks([NotNull] Terrain terrain, ref int numChunksX, ref int numChunksY);
 
+        [StaticAccessor("GetLightmapSettings()")]
+        public static extern BakeOnSceneLoadMode bakeOnSceneLoad { get; set; }
+
         [StaticAccessor("GetLightmapSettings()")]
         public static extern LightingDataAsset lightingDataAsset { get; set; }
 

Editor/Mono/GUI/EditorStyles.cs

@@ -257,6 +257,9 @@ public sealed class EditorStyles
         public static GUIStyle inspectorDefaultMargins { get { return s_Current.m_InspectorDefaultMargins; } }
         private GUIStyle m_InspectorDefaultMargins;
 
+        internal static GUIStyle inspectorHorizontalDefaultMargins => s_Current.m_InspectorHorizontalDefaultMargins;
+        private GUIStyle m_InspectorHorizontalDefaultMargins;
+
         public static GUIStyle inspectorFullWidthMargins { get { return s_Current.m_InspectorFullWidthMargins; } }
         private GUIStyle m_InspectorFullWidthMargins;
 
@@ -564,6 +567,11 @@ private void InitSharedStyles()
                 padding = new RectOffset(kInspectorPaddingLeft, kInspectorPaddingRight, kInspectorPaddingTop, 0)
             };
 
+            m_InspectorHorizontalDefaultMargins = new GUIStyle
+            {
+                padding = new RectOffset(kInspectorPaddingLeft, kInspectorPaddingRight, 0, 0)
+            };
+
             // For the full width margins, use padding from right side in both sides,
             // though adjust for overdraw by adding one in left side to get even margins.
             m_InspectorFullWidthMargins = new GUIStyle

Editor/Mono/Inspector/Core/ScriptAttributeGUI/PropertyHandler.cs

@@ -300,11 +300,7 @@ internal bool OnGUI(Rect position, SerializedProperty property, GUIContent label
                 if (childrenAreExpanded)
                 {
                     SerializedProperty endProperty = prop.GetEndProperty();
-                    // Children need to be indented
-                    int prevIndent = EditorGUI.indentLevel;
-                    EditorGUI.indentLevel++;
-                    position = EditorGUI.IndentedRect(position);
-                    EditorGUI.indentLevel = prevIndent;
+
                     while (prop.NextVisible(childrenAreExpanded) && !SerializedProperty.EqualContents(prop, endProperty))
                     {
                         if (GUI.isInsideList && prop.depth <= EditorGUI.GetInsideListDepth())

Editor/Mono/Overlays/Overlay.cs

@@ -766,6 +766,11 @@ internal void ToggleCollapsedPopup()
             m_ModalPopup.Focus();
         }
 
+        public void RefreshPopup()
+        {
+            m_ModalPopup?.Refresh();
+        }
+
         void ClosePopup()
         {
             m_ModalPopup?.RemoveFromHierarchy();

Editor/Mono/Overlays/OverlayPopup.cs

@@ -33,13 +33,26 @@ class OverlayPopup : VisualElement
             AddToClassList(Overlay.ussClassName);
             style.position = Position.Absolute;
 
+            Refresh();
+
+            RegisterCallback<MouseEnterEvent>(evt => m_CursorIsOverPopup = true);
+            RegisterCallback<MouseLeaveEvent>(evt => m_CursorIsOverPopup = false);
+        }
+
+        public void Refresh()
+        {
             var root = this.Q("overlay-content");
+
+            root.Clear();
+
             root.renderHints = RenderHints.ClipWithScissors;
+            style.maxHeight = StyleKeyword.Initial;
+            style.maxWidth = StyleKeyword.Initial;
+
             root.Add(overlay.GetSimpleHeader());
             root.Add(overlay.CreatePanelContent());
 
-            RegisterCallback<MouseEnterEvent>(evt => m_CursorIsOverPopup = true);
-            RegisterCallback<MouseLeaveEvent>(evt => m_CursorIsOverPopup = false);
+            root.Focus();
         }
 
         public static OverlayPopup CreateUnderOverlay(Overlay overlay)

Editor/Mono/PlayerSettingsVulkan.bindings.cs

@@ -10,7 +10,27 @@ namespace UnityEditor
     public partial class PlayerSettings : UnityEngine.Object
     {
         public static extern bool vulkanEnableSetSRGBWrite { get; set; }
-        public static extern UInt32 vulkanNumSwapchainBuffers { get; set; }
+
+        private static extern UInt32 GetVulkanNumSwapchainBuffersImpl();
+        private static extern void SetVulkanNumSwapchainBuffersImpl(UInt32 value);
+
+        // NOTE: While in the editor, changing this value can be destructive so we force 3 swapchain buffers while running in the editor.
+        public static UInt32 vulkanNumSwapchainBuffers
+        {
+            get
+            {
+                // Must match the value PlayerSettings::kFixedEditorVulkanSwapchainBufferCount in native code, 
+                // explicitly report the current value being used.
+                const UInt32 kFixedEditorVulkanSwapchainBufferCount = 3;
+                if (EditorApplication.isPlaying)
+                    return kFixedEditorVulkanSwapchainBufferCount;
+                else
+                return GetVulkanNumSwapchainBuffersImpl();
+            }
+
+            set => SetVulkanNumSwapchainBuffersImpl(value);
+        }
+
         public static extern bool vulkanEnableLateAcquireNextImage { get; set; }
 
         [Obsolete("Vulkan SW command buffers are deprecated, vulkanUseSWCommandBuffers will be ignored.")]

Editor/Mono/SceneModeWindows/LightingWindow.cs

@@ -39,6 +39,8 @@ static class Styles
             public static readonly GUIContent progressiveGPUChangeWarning = EditorGUIUtility.TrTextContent("Changing the compute device used by the Progressive GPU Lightmapper requires the editor to be relaunched. Do you want to change device and restart?");
             public static readonly GUIContent gpuBakingProfile = EditorGUIUtility.TrTextContent("GPU Baking Profile", "The profile chosen for trading off between performance and memory usage when baking using the GPU.");
 
+            public static readonly GUIContent bakeOnSceneLoad = EditorGUIUtility.TrTextContent("Bake On Scene Load", "Whether to automatically generate lighting for Scenes that do not have valid lighting data when first opened."); 
+
             public static readonly GUIContent invalidEnvironmentLabel = EditorGUIUtility.TrTextContentWithIcon("Baked environment lighting does not match the current Scene state. Generate Lighting to update this.", MessageType.Warning);
             public static readonly GUIContent unsupportedDenoisersLabel = EditorGUIUtility.TrTextContentWithIcon("Unsupported denoiser selected", MessageType.Error);
 
@@ -539,6 +541,16 @@ void DrawBakingProfileSelector()
             }
         }
 
+        void DrawBakeOnLoadSelector()
+        {
+            var selected = (Lightmapping.BakeOnSceneLoadMode)EditorGUILayout.EnumPopup(Styles.bakeOnSceneLoad, Lightmapping.bakeOnSceneLoad);
+            if (selected != Lightmapping.bakeOnSceneLoad)
+            {
+                Undo.RecordObject(LightmapEditorSettings.GetLightmapSettings(), "Change Bake On Load Setting");
+                Lightmapping.bakeOnSceneLoad = selected;
+            }
+        }
+
         void DrawBottomBarGUI(Mode selectedMode)
         {
             using (new EditorGUI.DisabledScope(EditorApplication.isPlayingOrWillChangePlaymode))
@@ -552,6 +564,7 @@ void DrawBottomBarGUI(Mode selectedMode)
                 // Bake settings.
                 DrawGPUDeviceSelector();
                 DrawBakingProfileSelector();
+                DrawBakeOnLoadSelector();
 
                 {
                     // Bake button if we are not currently baking

Editor/Mono/SceneView/SceneView.cs

@@ -2459,6 +2459,10 @@ void HandleViewToolCursor(Rect cameraRect)
         {
             if (!Tools.viewToolActive || Event.current.type != EventType.Repaint)
                 return;
+            // In case multiple scene views are opened, we only want to set the cursor for the one being hovered
+            // Skip if the mouse is over an overlay or an area that should not use a custom cursor
+            if (mouseOverWindow is SceneView view && (mouseOverWindow != this || !view.sceneViewMotion.viewportsUnderMouse))
+                return;
 
             var cursor = MouseCursor.Arrow;
             switch (Tools.viewTool)
@@ -3012,13 +3016,6 @@ void HandleMouseCursor()
                 bool repaintView = false;
                 MouseCursor cursor = MouseCursor.Arrow;
 
-                //Reset the cursor if the mouse is over an overlay or an area that should not use a custom cursor
-                if (mouseOverWindow is SceneView view && !view.sceneViewMotion.viewportsUnderMouse)
-                {
-                    InternalEditorUtility.ResetCursor();
-                    return;
-                }
-
                 foreach (CursorRect r in s_MouseRects)
                 {
                     if (r.rect.Contains(evt.mousePosition))