Merge pull request #8135 from Unity-Technologies/internal/6000.0/staging

Internal/6000.0/staging

Author: UnityAljosha

Packages/com.unity.render-pipelines.core/Documentation~/Rendering-Debugger.md

@@ -6,7 +6,7 @@ If your project uses a custom Scriptable Render Pipeline (SRP), you can add cont
 
 If your project uses the Universal Render Pipeline (URP) or the High-Definition Render Pipeline (HDRP), refer to the following pages:
 
-- [Add controls to the Rendering Debugger in URP](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@15.0/manual/features/rendering-debugger-add-controls.html)
+- [Add controls to the Rendering Debugger in URP](https://docs.unity3d.com/Manual/urp/features/rendering-debugger-add-controls.html)
 - [Add controls to the Rendering Debugger in HDRP](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@15.0/manual/Rendering-Debugger-Add-Controls.html)
 
 ## How to access the Rendering Debugger

Packages/com.unity.render-pipelines.core/Documentation~/TableOfContents.md

@@ -2,6 +2,7 @@
 * [What's new](whats-new.md)
   * [12](whats-new-12.md)
   * [13](whats-new-13.md)
+  * [17](whats-new-17.md)
 * [Creating a custom render pipeline](srp-custom.md)
   * [Create a custom Scriptable Render Pipeline](srp-custom-getting-started.md)
   * [Create a Render Pipeline Asset and Render Pipeline Instance in a custom render pipeline](srp-creating-render-pipeline-asset-and-render-pipeline-instance.md)

Packages/com.unity.render-pipelines.core/Documentation~/User-Render-Requests.md

@@ -8,7 +8,7 @@ The request is processed sequentially in your script, so there's no callback inv
 
 `RenderPipeline.StandardRequest` renders the following:
 
-* A full stack of cameras in the [Universal Render Pipeline](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@latest/index.html) (URP).
+* A full stack of cameras in the [Universal Render Pipeline](https://docs.unity3d.com/Manual/urp/urp-introduction.html) (URP).
 * A single camera in the [High Definition Render Pipeline](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest/index.html) (HDRP).
 
 The following code sample gets the output of the scriptable render pipeline when you select a GUI button. Attach the script to a camera and select **Enter Play Mode**.
@@ -91,4 +91,4 @@ public class StandardRenderRequest : MonoBehaviour
 
 ## Other useful information
 
-* On [Universal Render Pipeline (URP)](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@17.0/manual/User-Render-Requests.html).
+* On [Universal Render Pipeline (URP)](https://docs.unity3d.com/Manual/urp/User-Render-Requests.html).

Packages/com.unity.render-pipelines.core/Documentation~/index.md

@@ -6,4 +6,4 @@ SRP Core contains reusable code, including boilerplate code for working with pla
 
 If you are creating a custom SRP from scratch or customizing a prebuilt SRP, using SRP Core will save you time.
 
-For more information on SRP, including a guide to getting started with a custom SRP, see the [SRP documentation](https://docs.unity3d.com/Manual/ScriptableRenderPipeline.html). For more information on Unity's prebuilt SRPs, see the [Universal Render Pipeline (URP) documentation](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@latest), or the [High Definition Render Pipeline (HDRP) documentation](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest).
+For more information on SRP, including a guide to getting started with a custom SRP, see the [SRP documentation](https://docs.unity3d.com/Manual/ScriptableRenderPipeline.html). For more information on Unity's prebuilt SRPs, see the [Universal Render Pipeline (URP) documentation](https://docs.unity3d.com/Manual/urp/urp-introduction.html), or the [High Definition Render Pipeline (HDRP) documentation](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest).

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugState.cs

@@ -237,9 +237,15 @@ public override void SetValue(object value, DebugUI.IValueField field)
     /// <summary>
     /// Unsigned Integer Debug State.
     /// </summary>
-    [Serializable, DebugState(typeof(DebugUI.UIntField), typeof(DebugUI.MaskField))]
+    [Serializable, DebugState(typeof(DebugUI.UIntField))]
     public sealed class DebugStateUInt : DebugState<uint> { }
 
+    /// <summary>
+    /// Rendering layer mask state.
+    /// </summary>
+    [Serializable, DebugState(typeof(DebugUI.RenderingLayerField))]
+    public sealed class DebugStateRenderingLayer : DebugState<RenderingLayerMask> { }
+
     /// <summary>
     /// Float Debug State.
     /// </summary>

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugUIDrawer.Builtins.cs

@@ -398,12 +398,11 @@ protected override Enum DoGUI(Rect rect, GUIContent label, DebugUI.BitField fiel
         }
     }
 
-
     /// <summary>
     /// Builtin Drawer for Maskfield Debug Items.
     /// </summary>
-    [DebugUIDrawer(typeof(DebugUI.MaskField))]
-    public sealed class DebugUIDrawerMaskField : DebugUIFieldDrawer<uint, DebugUI.MaskField, DebugStateUInt>
+    [DebugUIDrawer(typeof(DebugUI.RenderingLayerField))]
+    public sealed class DebugUIDrawerRenderingLayerField : DebugUIFieldDrawer<RenderingLayerMask, DebugUI.RenderingLayerField, DebugStateRenderingLayer>
     {
         /// <summary>
         /// Does the field of the given type
@@ -413,15 +412,10 @@ public sealed class DebugUIDrawerMaskField : DebugUIFieldDrawer<uint, DebugUI.Ma
         /// <param name="field">The field</param>
         /// <param name="state">The state</param>
         /// <returns>The current value from the UI</returns>
-        protected override uint DoGUI(Rect rect, GUIContent label, DebugUI.MaskField field, DebugStateUInt state)
+        protected override RenderingLayerMask DoGUI(Rect rect, GUIContent label, DebugUI.RenderingLayerField field, DebugStateRenderingLayer state)
         {
             uint value = field.GetValue();
-
-            var enumNames = new string[field.enumNames.Length];
-            for (int i = 0; i < enumNames.Length; i++)
-                enumNames[i] = field.enumNames[i].text;
-            var mask = EditorGUI.MaskField(rect, label, (int)value, enumNames);
-
+            var mask = EditorGUI.MaskField(rect, label, (int)value, field.renderingLayersNames);
             return (uint)mask;
         }
     }

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.cs

@@ -43,7 +43,7 @@ void OnEnable()
             hideFlags = HideFlags.HideAndDontSave;
         }
     }
-    
+
     [CoreRPHelpURL("Rendering-Debugger")]
     sealed class DebugWindow : EditorWindowWithHelpButton, IHasCustomMenu
     {
@@ -478,22 +478,22 @@ void OnGUI()
                     using (new EditorGUILayout.VerticalScope())
                     {
                         var selectedPanel = panels[m_Settings.selectedPanel];
-                        
+
                         using (new EditorGUILayout.HorizontalScope())
                         {
                             var style = new GUIStyle(CoreEditorStyles.sectionHeaderStyle) { fontStyle = FontStyle.Bold };
                             EditorGUILayout.LabelField(new GUIContent(selectedPanel.displayName), style);
-                            
+
                             // Context menu
                             var rect = GUILayoutUtility.GetLastRect();
                             var contextMenuRect = new Rect(rect.xMax, rect.y + 4f, 16f, 16f);
-                            
+
                             CoreEditorUtils.ShowHelpButton(contextMenuRect, selectedPanel.documentationUrl, new GUIContent($"{selectedPanel.displayName} panel."));
                         }
 
                         const float leftMargin = 4f;
                         GUILayout.Space(leftMargin);
-                        
+
                         using (var scrollScope = new EditorGUILayout.ScrollViewScope(m_ContentScroll))
                         {
                             TraverseContainerGUI(selectedPanel);
@@ -544,6 +544,11 @@ void OnWidgetGUI(DebugUI.Widget widget)
             if (widget.isInactiveInEditor || widget.isHidden)
                 return;
 
+            if (widget.queryPath == null)
+            {
+                Debug.LogError($"Widget {widget.GetType()} query path is null");
+                return;
+            }
             // State will be null for stateless widget
             m_WidgetStates.TryGetValue(widget.queryPath, out DebugState state);
 

Packages/com.unity.render-pipelines.core/Editor/Deprecated.cs

@@ -158,4 +158,34 @@ public DefaultVolumeProfileEditor(Editor baseEditor, VolumeProfile profile)
             m_TargetSerializedObject = baseEditor.serializedObject;
         }
     }
+
+
+
+    /// <summary>
+    /// Builtin Drawer for Maskfield Debug Items.
+    /// </summary>
+    [DebugUIDrawer(typeof(DebugUI.MaskField))]
+    [Obsolete("DebugUI.MaskField has been deprecated and is not longer supported, please use BitField instead. #from(6000.2)", false)]
+    public sealed class DebugUIDrawerMaskField : DebugUIFieldDrawer<uint, DebugUI.MaskField, DebugStateUInt>
+    {
+        /// <summary>
+        /// Does the field of the given type
+        /// </summary>
+        /// <param name="rect">The rect to draw the field</param>
+        /// <param name="label">The label for the field</param>
+        /// <param name="field">The field</param>
+        /// <param name="state">The state</param>
+        /// <returns>The current value from the UI</returns>
+        protected override uint DoGUI(Rect rect, GUIContent label, DebugUI.MaskField field, DebugStateUInt state)
+        {
+            uint value = field.GetValue();
+
+            var enumNames = new string[field.enumNames.Length];
+            for (int i = 0; i < enumNames.Length; i++)
+                enumNames[i] = field.enumNames[i].text;
+            var mask = EditorGUI.MaskField(rect, label, (int)value, enumNames);
+
+            return (uint)mask;
+        }
+    }
 }

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.Serialization.cs

@@ -1070,7 +1070,11 @@ unsafe static void WriteBakingCells(BakingCell[] bakingCells)
 
             AssetDatabase.ImportAsset(cellDataFilename);
             AssetDatabase.ImportAsset(cellOptionalDataFilename);
-            AssetDatabase.ImportAsset(cellProbeOcclusionDataFilename);
+            // If we did not write a probe occlusion file (because it was zero bytes), don't try to load it (UUM-101480)
+            if (probeOcclusion.Length > 0)
+            {
+                AssetDatabase.ImportAsset(cellProbeOcclusionDataFilename);
+            }
             AssetDatabase.ImportAsset(cellBricksDataFilename);
             AssetDatabase.ImportAsset(cellSharedDataFilename);
             AssetDatabase.ImportAsset(cellSupportDataFilename);