Merge pull request #8175 from Unity-Technologies/internal/2022.3/staging

Internal/2022.3/staging

Author: claire-nicholson

Packages/com.unity.render-pipelines.high-definition/Documentation~/Override-Contact-Shadows.md

@@ -19,6 +19,8 @@ The property to enable in your Frame Settings is: **Lighting > Contact Shadows**
 
 You can enable Contact Shadows on a per Light basis for Directional, Point, and Spot Lights. Tick the **Enable** checkbox under the **Contact Shadows** drop-down in the **Shadows** section of each Light to indicate that HDRP should calculate Contact Shadows for that Light.
 
+If you use both contact shadows and [realtime shadows](realtime-shadows.md), there might be a visible seam between the two types of shadow. To avoid this issue, set shadow maps to use a high resolution. For more information, refer to [Control shadow resolution and quality](Shadows-in-HDRP.md).
+
 **Note**: A Light casts Contact Shadows for every Mesh Renderer that uses a Material that writes to the depth buffer. This is regardless of whether you enable or disable the **Cast Shadows** property on the Mesh Renderer. This means that you can disable **Cast Shadows** on small GameObjects/props and still have them cast Contact Shadows. This is good if you do not want HDRP to render these GameObjects in shadow maps. If you do not want this behavior, use Shader Graph to author a Material that does not write to the depth buffer.
 
 [!include[](snippets/volume-override-api.md)]

Packages/com.unity.render-pipelines.high-definition/Documentation~/Ray-Traced-Shadows.md

@@ -73,7 +73,7 @@ Ray-traced shadows allow for transparent and transmissive GameObjects, lit by Di
 | **Sample Count**      | Controls the number of rays that HDRP uses per pixel, per frame. Higher values produce more accurate shadows. Increasing this value increases execution time linearly. |
 | **Color Shadow**      | Allows transparent and transmissive GameObjects to cast colored shadows. A Material can only cast colored shadows when its [**Refraction Model**](Surface-Type.md#transparency-inputs) is set to **Thin**, **Box** or **Sphere**. |
 | **Denoise**           | Enables the spatio-temporal filter that HDRP uses to remove noise from the ray-traced shadows; making them smoother. |
-| - **Denoiser Radius** | Controls the radius of the spatio-temporal filter.           |
+| - **Denoiser Radius** | Increases or decreases the blurriness between ray traced shadows, by controlling the radius of the spatio-temporal filter. |
 
 <a name="PointLight"></a>
 

Packages/com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Includes/SpriteNormalPass.hlsl

@@ -1,3 +1,5 @@
+#include "Packages/com.unity.render-pipelines.universal/Shaders/2D/Include/Core2D.hlsl"
+
 PackedVaryings vert(Attributes input)
 {
     Varyings output = (Varyings)0;

Packages/com.unity.shadergraph/Documentation~/Float.md renamed to Packages/com.unity.shadergraph/Documentation~/Float-Node.md

@@ -10,7 +10,7 @@ namespace UnityEditor.ShaderGraph
     [Serializable]
     class ShaderKeyword : ShaderInput
     {
-        public const string kVariantLimitWarning = "Graph is generating too many variants. Either delete Keywords, reduce Keyword variants or increase the Shader Variant Limit in Preferences > Shader Graph.";
+        public const string kVariantLimitWarning = "Graph is generating too many variants. Either delete Keywords, reduce Keyword variants or increase the Shader Variant Limit in Preferences > Shader Graph or Project Settings > Shader Graph.";
 
         public ShaderKeyword()
         {

Packages/com.unity.shadergraph/Editor/Data/Graphs/ShaderKeyword.cs

@@ -4,6 +4,7 @@
 using UnityEngine;
 using UnityEditor.Graphing;
 using UnityEditor.ShaderGraph.Internal;
+using UnityEngine.Rendering.ShaderGraph;
 
 namespace UnityEditor.ShaderGraph
 {
@@ -103,6 +104,15 @@ public override string ToString()
         [SerializeField]
         List<string> m_DropdownSelectedEntries = new List<string>();
 
+        public override string documentationURL {
+            get {
+                // TODO: There should be a way for unity authored and distributed subgraphs to provide custom doc links.
+                if (name.Contains("SpeedTree8"))
+                    return Documentation.GetPageLink("SpeedTree8-SubGraphAssets");
+                else return Documentation.GetPageLink("Sub-graph");
+            }
+        }
+
         public string subGraphGuid
         {
             get

Packages/com.unity.shadergraph/Editor/Data/Nodes/Utility/SubGraphNode.cs

@@ -212,6 +212,7 @@ public GraphEditorView(EditorWindow editorWindow, GraphData graph, MessageManage
                 {
                     UserViewSettingsChangeCheck(newColorIndex);
                 }
+                GUILayout.Space(6);
                 GUILayout.EndHorizontal();
             });
             Add(toolbar);

Packages/com.unity.shadergraph/Editor/Drawing/Views/GraphEditorView.cs

@@ -4,6 +4,7 @@
 using UnityEngine.UIElements;
 using UnityEditor.UIElements;
 using UnityEditor.Graphing;
+using UnityEditor.ShaderGraph.Drawing.Inspector;
 
 namespace UnityEditor.ShaderGraph.Drawing
 {
@@ -62,6 +63,7 @@ private void Draw(CustomFunctionNode node)
                     node.functionName = m_FunctionName.value;
                     node.ValidateNode();
                     node.Dirty(ModificationScope.Graph);
+                    this.GetFirstAncestorOfType<InspectorView>()?.RefreshInspectables();
                 }
             });
 

Packages/com.unity.shadergraph/Editor/Drawing/Views/HlslFunctionView.cs

@@ -11,11 +11,14 @@
 using UnityEditor.ShaderGraph.Internal;
 using UnityEditor.ShaderGraph.Serialization;
 using Object = System.Object;
+using UnityEngine.Rendering.ShaderGraph;
+using UnityEngine.Rendering;
 
 namespace UnityEditor.ShaderGraph
 {
     [ExcludeFromPreset]
     [ScriptedImporter(131, Extension, -902)]
+    [CoreRPHelpURL("Shader-Graph-Asset", "com.unity.shadergraph")]    
     class ShaderGraphImporter : ScriptedImporter
     {
         public const string Extension = "shadergraph";

Packages/com.unity.shadergraph/Editor/Importers/ShaderGraphImporter.cs

@@ -15,11 +15,13 @@
 using UnityEditor.ShaderGraph.Internal;
 using UnityEditor.ShaderGraph.Serialization;
 using UnityEngine.Pool;
+using UnityEngine.Rendering;
 
 namespace UnityEditor.ShaderGraph
 {
     [ExcludeFromPreset]
     [ScriptedImporter(30, Extension, -905)]
+    [CoreRPHelpURL("Sub-graph", "com.unity.shadergraph")]
     class ShaderSubGraphImporter : ScriptedImporter
     {
         public const string Extension = "shadersubgraph";
@@ -423,7 +425,7 @@ static void GatherDescendentsFromGraph(GUID rootAssetGuid, out bool containsCirc
         {
             var dependencyMap = new Dictionary<GUID, GUID[]>();
             AssetCollection tempAssetCollection = new AssetCollection();
-            using (ListPool<GUID>.Get(out var tempList))
+            using (UnityEngine.Pool.ListPool<GUID>.Get(out var tempList))
             {
                 GatherDependencyMap(rootAssetGuid, dependencyMap, tempAssetCollection);
                 containsCircularDependency = ContainsCircularDependency(rootAssetGuid, dependencyMap, tempList);