Merge pull request #8155 from Unity-Technologies/internal/6000.1/staging

Internal/6000.1/staging

Author: UnityAljosha

Packages/com.unity.render-pipelines.core/.buginfo

@@ -1,5 +1,5 @@
 rule1:
-  area: SRP Architecture & API
+  area: SRP Foundation
 
 rule2:
   when:

Packages/com.unity.render-pipelines.core/Documentation~/Images/LightAnchorAnimation.gif

@@ -4,7 +4,7 @@ An Environment Library is an Asset that contains a list of environments that you
 
 <a name="Creation"></a>
 
-![](Images/LookDevEnvironmentLibrary1.png)
+![Environment Library asset.](Images/LookDevEnvironmentLibrary1.png)
 
 ## Creating an Environment Library
 
@@ -26,13 +26,13 @@ To add, remove, or duplicate environments, use the toolbar at the bottom of the
 
 | **Button**                                                   | **Function**  | **Description**                                              |
 | ------------------------------------------------------------ | ------------- | ------------------------------------------------------------ |
-| ![](Images/LookDevEnvironmentLibrary2.png) | **Add**       | Click this button to add a new environment to the bottom of the list. |
-| ![](Images/LookDevEnvironmentLibrary3.png) | **Remove**    | Click this button to remove the environment currently selected. Note that the environment that you have selected is the one with the blue frame. |
-| ![](Images/LookDevEnvironmentLibrary4.png)                   | **Duplicate** | Click this button to duplicate the currently selected environment and add it as a new environment to the bottom of the list. |
+| ![This button adds a new environment to the bottom of the list.](Images/LookDevEnvironmentLibrary2.png) | **Add**       | Click this button to add a new environment to the bottom of the list. |
+| ![This button removes the currently selected environment.](Images/LookDevEnvironmentLibrary3.png) | **Remove**    | Click this button to remove the environment currently selected. Note that the environment that you have selected is the one with the blue frame. |
+| ![This button duplicates the currently selected environment.](Images/LookDevEnvironmentLibrary4.png)                   | **Duplicate** | Click this button to duplicate the currently selected environment and add it as a new environment to the bottom of the list. |
 
 ## Properties
 
-![](Images/LookDevEnvironmentLibrary5.png)
+![Environment Library properties](Images/LookDevEnvironmentLibrary5.png)
 
 | **Property**        | **Description**                                              |
 | ------------------- | ------------------------------------------------------------ |

Packages/com.unity.render-pipelines.core/Documentation~/Images/videos/light-anchor-animation.mp4

@@ -46,15 +46,15 @@ Use the toolbar in the top-left of the window to change which viewing mode Look
 
 ### Single viewport
 
-![](Images/LookDev1.png)
+![Buttons for switching between viewports 1 and 2.](Images/LookDev1.png)
 
 By default, Look Dev displays a single viewport which contains the Prefab or GameObject you are working with. If you are in another viewing mode, you can click either the number **1** or number **2** button to go back to single view. Each button corresponds to a viewport in Look Dev. Select button **1** to use viewport 1, and button 2 to use viewport **2**.
 
 <a name="MultiView"></a>
 
 ### Multi-viewport
 
-![](Images/LookDev2.png)
+![Buttons for changing the multi-viewport mode.](Images/LookDev2.png)
 
 Use multiple viewports to compare different environments and settings for the same Asset. You can arrange viewports:
 
@@ -73,23 +73,21 @@ When using multiple viewports, it only makes sense to compare different Prefabs
 
 Vertical and horizontal side-by-side viewports show an identical view of your Asset.
 
-![](Images/LookDev3.png)
+![Vertical side-by-side viewport view.](Images/LookDev3.png)
 
 ##### Split-screen
 
 In a split-screen view, there is a red/blue manipulation Gizmo that separates the two viewports. For information on how to use this Gizmo, see [Using the manipulation Gizmo](#ManipulationGizmo).
 
-![](Images/LookDev4.png)
+![Split-screen viewport view.](Images/LookDev4.png)
 
 #### Multi-viewport Camera
 
 By default, Look Dev synchronizes the camera movement for both views. To decouple the Cameras from one another, and manipulate them independently, click the **Synchronized Cameras** button in-between the two numbered Camera buttons.
 
-![](Images/LookDev5.png)
-
 To align the cameras with each other, or reset them, click on the drop-down arrow next to the viewport **2** icon:
 
-![](Images/LookDev6.png)
+![Drop-down options of multi-viewport cameras.](Images/LookDev6.png)
 
 <a name="ManipulationGizmo"></a>
 
@@ -101,13 +99,11 @@ The manipulation Gizmo represents the separation plane between the two viewports
 
 To move the separator, click and drag the straight line of the Gizmo to the location you want.
 
-![](Images/LookDev7.png)
-
 #### Changing the orientation and length
 
 To change the orientation and length of the manipulator Gizmo, click and drag the circle at either end of the manipulator. Changing the length of the Gizmo lets you  set the orientation and [blending](#Blending) values more precisely.
 
-![](Images/LookDev8.png))
+![Click and drag the circle at either end of the gizmo to change its orientation and length.](Images/LookDev8.png)
 
 #### Changing the split in increments
 
@@ -121,7 +117,7 @@ The central white circle on the separator allows you to blend between the two vi
 
 The white circle automatically snaps back into the center when you drag it back. This helps you get back to the default blending value quickly.
 
-![](Images/LookDev9.png)
+![The white circle on the separator lets you change the blending behavior.](Images/LookDev9.png)
 
 ### HDRI environments in Look Dev
 

Packages/com.unity.render-pipelines.core/Documentation~/Look-Dev-Environment-Library.md

@@ -127,7 +127,7 @@ public class CustomDebugPanel : MonoBehaviour
 
 Add the script to a GameObject. You should see a new **My Custom Panel** panel in the **Rendering Debugger** window.
 
-![](Images/rendering-debugger.png)
+![Screenshot of the Rendering Debugger window showing a new custom panel.](Images/rendering-debugger.png)
 
 ### Add a control to an existing panel
 

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

@@ -17,13 +17,13 @@ Use the **Orbit** and **Elevation** to control the orientation of the light, in
 
 You can use the **Anchor Position Override** to provide a GameObject’s [Transform](https://docs.unity3d.com/ScriptReference/Transform.html) as an anchor point for the Light. This is useful if you want the Light to follow a specific GameObject in the Scene.
 
-![](Images/LightAnchorAnimation.gif)
+<video title="A light uses the main camera as the reference GamObject that controls the rotation of the light. The light rotates synchronously with the camera." src="Images/videos/light-anchor-animation.mp4" width="100%" height="auto" autoplay="true" loop="true" controls></video>
 
 **Note**: The above example uses the Main Camera as the reference Camera that adjusts the light rotation. The Common presets might create a different result in the Scene View if your view isn't aligned with the Main Camera.
 
 You can set a **Position Offset** for this custom Anchor. This is useful if the Transform position of the custom Anchor isn't centered appropriately for the light to orbit correctly around the custom Anchor.
 
-![](Images/LightAnchor0.png)
+![Light Anchor component screenshot. Orbit and Elevation properties display example values that change the orientation of a light.](Images/LightAnchor0.png)
 
 
 The Light Anchor component also includes a list of **Presets** that you can use to set the Light's orientation relative to the main Camera.

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

@@ -37,7 +37,7 @@ public class MySettings : IRenderPipelineGraphicsSettings
   public Material myMaterial;
 }
 ```
-![](Images/customsettings-addsetting.png)<br/>
+![Screenshot of the Project Settings window. The Graphics section contains the new custom settings from the example script.](Images/customsettings-addsetting.png)<br/>
 The **Edit** > **Project Settings** > **Graphics** window with the new custom setting from the example script.
 
 ## Set the default asset for a reference property

Packages/com.unity.render-pipelines.core/Documentation~/View-Lighting-Tool.md

@@ -37,7 +37,7 @@ public class MySettings : IRenderPipelineGraphicsSettings
 }
 ```
 
-![](Images/customsettings-settingsgroup.png)<br/>
+![Screenshot of the Project Settings window. The Graphics section contains the new custom settings group from the example script.](Images/customsettings-settingsgroup.png)<br/>
 The **Edit** > **Project Settings** > **Graphics** window with the new custom settings group from the example script.
 
 ## Change the display order of settings groups

Packages/com.unity.render-pipelines.core/Documentation~/add-custom-graphics-setting.md

@@ -30,4 +30,4 @@ For example:
 
 Unity shows the new properties in the **Core Render Pipeline** settings section:
 
-![](Images/core_render_pipeline_preference_provider.png)
+![Screenshot of the Preferences window showing the new properties in the Core Render Pipeline settings section.](Images/core_render_pipeline_preference_provider.png)

Packages/com.unity.render-pipelines.core/Documentation~/add-custom-graphics-settings.md

@@ -55,16 +55,16 @@ public class MySettingsPropertyDrawer : PropertyDrawer
 
 To add items to the **More** (⋮) menu of a settings group, follow these steps:
 
-1. Create a class that implements the [`IRenderPipelineGraphicsSettingsContextMenu`](https://docs.unity3d.com/6000.1/Documentation/ScriptReference/Rendering.IRenderPipelineGraphicsSettingsContextMenu.html) interface.
+1. Create a class that implements the [`IRenderPipelineGraphicsSettingsContextMenu2<T>`](https://docs.unity3d.com/6000.1/Documentation/ScriptReference/Rendering.IRenderPipelineGraphicsSettingsContextMenu2_1.html) interface.
 2. Implement the `PopulateContextMenu` method.
 3. To add an item, use the `AddItem` API.
 
 For example:
 
 ```c#
-public class MySettingsContextMenu : IRenderPipelineGraphicsSettingsContextMenu<MySettings>
+public class MySettingsContextMenu : IRenderPipelineGraphicsSettingsContextMenu2<MySettings>
 {
-    void IRenderPipelineGraphicsSettingsContextMenu<MySettings>.PopulateContextMenu(MySettings setting, PropertyDrawer _, ref GenericMenu menu)
+    void IRenderPipelineGraphicsSettingsContextMenu2<MySettings>.PopulateContextMenu(MySettings setting, SerializedProperty _, ref GenericMenu menu)
     {
         menu.AddItem(new GUIContent("My custom menu item"), false, () => { Debug.Log("Menu item was selected."); });
     }
@@ -74,4 +74,5 @@ public class MySettingsContextMenu : IRenderPipelineGraphicsSettingsContextMenu<
 ## Additional resources
 
 - [PropertyDrawer](xref:UnityEditor.PropertyDrawer)
-- [IRenderPipelineGraphicsSettingsContextMenu](https://docs.unity3d.com/6000.1/Documentation/ScriptReference/Rendering.IRenderPipelineGraphicsSettingsContextMenu.html)
+- [IRenderPipelineGraphicsSettingsContextMenu2](https://docs.unity3d.com/6000.2/Documentation/ScriptReference/Rendering.IRenderPipelineGraphicsSettingsContextMenu2.html)
+- [IRenderPipelineGraphicsSettingsContextMenu2<T>](https://docs.unity3d.com/6000.2/Documentation/ScriptReference/Rendering.IRenderPipelineGraphicsSettingsContextMenu2_1.html)

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

@@ -1,5 +1,5 @@
 rule1:
-  area: SRP Architecture & API
+  area: SRP Foundation
 
 rule2:
   when:
@@ -15,7 +15,7 @@ rule3:
       - ^.*CoreRenderPipelinePreferences.*$
       - ^.*InspectorCurveEditor.*$
       - ^.*RemoveAdditionalDataUtils.*$
-  area: SRP Workflow
+  area: SRP Settings
 
 rule4:
   when:

Packages/com.unity.render-pipelines.core/Documentation~/customize-ui-for-a-setting.md

@@ -1 +1 @@
-area: SRP Workflow
+area: SRP Settings

Packages/com.unity.render-pipelines.core/Editor/.buginfo

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Rendering;
+using UnityEngine.UIElements;
 
 namespace UnityEditor.Rendering
 {
@@ -182,7 +183,28 @@ public DefaultVolumeProfileEditor(Editor baseEditor, VolumeProfile profile)
         }
     }
 
+    public abstract partial class DefaultVolumeProfileSettingsPropertyDrawer
+    {        
+        /// <summary>
+        /// Context menu implementation for Default Volume Profile.
+        /// </summary>
+        /// <typeparam name="TSetting">Default Volume Profile Settings type</typeparam>
+        /// <typeparam name="TRenderPipeline">Render Pipeline type</typeparam>
+        [Obsolete("Use DefaultVolumeProfileSettingsPropertyDrawer<T>.DefaultVolumeProfileSettingsContextMenu2<TSetting, TRenderPipeline> instead #from(6000.0)")]
+        public abstract class DefaultVolumeProfileSettingsContextMenu<TSetting, TRenderPipeline> : IRenderPipelineGraphicsSettingsContextMenu<TSetting>
+            where TSetting : class, IDefaultVolumeProfileSettings
+            where TRenderPipeline : RenderPipeline
+        {
+            /// <summary>
+            /// Path where new Default Volume Profile will be created.
+            /// </summary>
+            [Obsolete("Not used anymore. #from(6000.0)")]
+            protected abstract string defaultVolumeProfilePath { get; }
 
+            [Obsolete("Not used anymore. #from(6000.0)")]
+            void IRenderPipelineGraphicsSettingsContextMenu<TSetting>.PopulateContextMenu(TSetting setting, PropertyDrawer property, ref GenericMenu menu){ }
+        }
+    }
 
     /// <summary>
     /// Builtin Drawer for Maskfield Debug Items.

Packages/com.unity.render-pipelines.core/Editor/Camera/.buginfo

@@ -1 +1 @@
-area: SRP Workflow
+area: SRP Settings

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

@@ -1 +1 @@
-area: SRP Workflow
+area: SRP Settings

Packages/com.unity.render-pipelines.core/Editor/Gizmo/.buginfo

@@ -748,16 +748,16 @@ static bool SetBakingContext(List<ProbeVolumePerSceneData> perSceneData)
             for (int i = 0; i < perSceneData.Count; ++i)
             {
                 var data = perSceneData[i];
-                var scene = data.gameObject.scene;
-                var sceneGUID = scene.GetGUID();
+                var sceneGUID = data.sceneGUID;
                 var bakingSet = ProbeVolumeBakingSet.GetBakingSetForScene(sceneGUID);
 
                 if (bakingSet == null)
                 {
                     if (isBakingSingleScene)
                         continue;
 
-                    Debug.LogError($"Scene '{scene.name}' does not belong to any Baking Set. Please add it to a Baking Set in the Adaptive Probe Volumes tab of the Lighting Window.");
+                    var sceneName = data.gameObject.scene.name;
+                    Debug.LogError($"Scene '{sceneName}' does not belong to any Baking Set. Please add it to a Baking Set in the Adaptive Probe Volumes tab of the Lighting Window.");
                     return false;
                 }
 
@@ -938,8 +938,11 @@ internal static bool PrepareBaking()
 
         static bool InitializeBake()
         {
-            if (ProbeVolumeLightingTab.instance?.PrepareAPVBake() == false) return false;
-            if (!ProbeReferenceVolume.instance.isInitialized || !ProbeReferenceVolume.instance.enabledBySRP) return false;
+            if (ProbeVolumeLightingTab.instance?.PrepareAPVBake(ProbeReferenceVolume.instance) == false)
+                return false;
+
+            if (!ProbeReferenceVolume.instance.isInitialized || !ProbeReferenceVolume.instance.enabledBySRP)
+                return false;
 
             using var scope = new BakingSetupProfiling(BakingSetupProfiling.Stages.PrepareWorldSubdivision);
 
@@ -954,13 +957,16 @@ static bool InitializeBake()
                 }
             }
 
-            if (ProbeReferenceVolume.instance.perSceneDataList.Count == 0) return false;
+            if (ProbeReferenceVolume.instance.perSceneDataList.Count == 0)
+                return false;
 
             var sceneDataList = GetPerSceneDataList();
-            if (sceneDataList.Count == 0) return false;
+            if (sceneDataList.Count == 0)
+                return false;
 
             var pvList = GetProbeVolumeList();
-            if (pvList.Count == 0) return false; // We have no probe volumes.
+            if (pvList.Count == 0)
+                return false; // We have no probe volumes.
 
             CachePVHashes(pvList);