Merge pull request #8247 from Unity-Technologies/internal/6000.3/staging

Mirror Internal/6000.3/staging

Author: KEngelstoft

.gitattributes

@@ -375,10 +375,15 @@ Editor/Resources/unity[[:space:]]editor[[:space:]]resources filter=lfs diff=lfs
 # memoryprofiler test snapshots
 **/com.unity.memoryprofiler.tests/**/*.[sS][nN][aA][pP] filter=lfs diff=lfs merge=lfs -text
 
-
 # buginfo tools
 /Tools/Unity.BugInfo.Coverage/bin/* filter=lfs diff=lfs merge=lfs -text
 
 # search test cases
 /Modules/QuickSearch/Tests/QuickSearch/Assets/Cases/UUM-113048/uum-113048.index filter=lfs diff=lfs merge=lfs -text
 
+#SRP Templates
+/Templates/**/LightingData.asset binary
+/Templates/**/*.[pP][nN][gG] filter=lfs diff=lfs merge=lfs -text
+/Templates/**/*.[tT][gG][aA] filter=lfs diff=lfs merge=lfs -text
+/Templates/**/*.[tT][iI][fF] filter=lfs diff=lfs merge=lfs -text
+/Templates/**/*.[fF][bB][xX] filter=lfs diff=lfs merge=lfs -text

Packages/com.unity.render-pipelines.core/Editor/LookDev/DisplayWindow.EnvironmentLibrarySidePanel.cs

@@ -451,7 +451,7 @@ void IEnvironmentDisplayer.Repaint()
         void OnFocus()
         {
             //OnFocus is called before OnEnable that open backend if not already opened, so only sync if backend is open
-            if (LookDev.open)
+            if (LookDev.open && LookDev.currentContext != null)
             {
                 //If EnvironmentLibrary asset as been edited by the user (deletion),
                 //update all view to use null environment if it was not temporary ones

Packages/com.unity.render-pipelines.core/Runtime/UnifiedRayTracing/RayTracingResources.cs

@@ -5,6 +5,11 @@
 
 namespace UnityEngine.Rendering.UnifiedRayTracing
 {
+    [Scripting.APIUpdating.MovedFrom(
+        autoUpdateAPI: true,
+        sourceNamespace: "UnityEngine.Rendering.UnifiedRayTracing",
+        sourceAssembly: "Unity.Rendering.LightTransport.Runtime"
+    )]
     [Serializable]
     [SupportedOnRenderPipeline()]
     [Categorization.CategoryInfo(Name = "R: Unified Ray Tracing", Order = 1000), HideInInspector]

Packages/com.unity.render-pipelines.high-definition/Documentation~/Ray-Tracing-Settings.md

@@ -8,7 +8,7 @@ For more information about the ray tracing settings properties, refer to [Ray Tr
 ## Add objects to the Ray Tracing Acceleration Structure
 
 HDRP provides a utility function that adds objects to the ray tracing acceleration structure.
-The function is `AddInstanceToRAS` and it takes a [Renderer](https://docs.unity3d.com/ScriptReference/Renderer.html)) a `HDEffectsParameters` parameter and two a booleans that tracks changes in the transform and material properties of the included game objects.
+The function is `AddInstanceToRAS` and it takes a [Renderer](https://docs.unity3d.com/ScriptReference/Renderer.html) a `HDEffectsParameters` parameter and two a booleans that tracks changes in the transform and material properties of the included game objects.
 
 ```
 using System.Collections;

Packages/com.unity.render-pipelines.high-definition/Documentation~/creating-and-editing-lights-at-runtime.md

@@ -21,7 +21,7 @@ public class LightScript : MonoBehaviour
 }
 ```
 
-There is also a [RemoveHDLight]((https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest?subfolder=/api/UnityEngine.Rendering.HighDefinition.GameObjectExtension.html#UnityEngine_Rendering_HighDefinition_GameObjectExtension_AddHDLight_UnityEngine_GameObject_UnityEngine_Rendering_HighDefinition_HDLightTypeAndShape_)) method to remove the light created with AddHDLight.
+There is also a [RemoveHDLight](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest?subfolder=/api/UnityEngine.Rendering.HighDefinition.GameObjectExtension.html#UnityEngine_Rendering_HighDefinition_GameObjectExtension_AddHDLight_UnityEngine_GameObject_UnityEngine_Rendering_HighDefinition_HDLightTypeAndShape_) method to remove the light created with AddHDLight.
 
 Note: Another good way of spawning lights is simply by spawning prefabs of lights you configured in the editor, this is also more efficient than manually adding components and setting values.
 

Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/CustomPassNodes.cs

@@ -19,8 +19,6 @@ public CustomColorBufferNode()
             UpdateNodeAfterDeserialization();
         }
 
-        public override string documentationURL => NodeUtils.GetDocumentationString("HD-Custom-Color");
-
         const int kUvInputSlotId = 0;
         const string kUvInputSlotName = "UV";
 

Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/EmissionNode.cs

@@ -21,7 +21,7 @@ public EmissionNode()
             UpdateNodeAfterDeserialization();
         }
 
-        public override string documentationURL => Documentation.GetPageLink("SGNode-Emission");
+        public override string documentationURL => NodeUtils.GetDocumentationString("Emission");
 
         [SerializeField]
         EmissiveIntensityUnit _intensityUnit;

Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/ExposureNode.cs

@@ -36,8 +36,6 @@ public ExposureNode()
             UpdateNodeAfterDeserialization();
         }
 
-        public override string documentationURL => Documentation.GetPageLink("SGNode-Exposure");
-
         [SerializeField]
         ExposureType m_ExposureType;
         [EnumControl("Type")]

Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/FresnelEquationNode.cs

@@ -33,8 +33,6 @@ class HDFresnelEquationNode : AbstractMaterialNode
 
         const string kFresnelOutputSlotName = "Fresnel";
 
-        public override string documentationURL => Documentation.GetPageLink("Fresnel-Equation-Node");
-
         private enum FresnelSlots
         {
             kDotVectorsInputSlotId,

Packages/com.unity.render-pipelines.high-definition/Editor/Material/ShaderGraph/Nodes/SurfaceGradientResolveNormal.cs

@@ -18,8 +18,6 @@ public SurfaceGradientResolveNormal()
             UpdateNodeAfterDeserialization();
         }
 
-        public override string documentationURL => Documentation.GetPageLink("SurfaceGradientResolveNormal");
-
         const int kNormalInputSlotId = 0;
         const string kNormalInputSlotName = "Normal";