[8.x.x] Merge 8.x.x/hd/staging (#1205)

* [10.x.x] Axf: add normal gradients and all mapping modes (uv, planar, triplanar) #583 * [10.x.x] Axf fix shininess exp to roughness, ssr transparent and alpha test #587 * Update Light-Component.md (#682) * push meta * removed undesired change in AXF * Fix transparent movec scene view #698 * Porting console fixes to staging (#699) * Update HDRP-Camera.md (#706) * Pre warm RT Handle system so that reallocations are reduced. #713 * Update PlanarReflectionProbeCache.cs * Update preview naming in raytrace component #753 * Workaround for GetKernelThreadGroupSizes returning wrong data #760 * Sanitize transparent motion vectors setting #761 * Standard terrain upgrader (#762) * Update Reflection-Probe (#790) * Update Reflection-Probe.md * Update Reflection-Probe.md Co-authored-by: sebastienlagarde <sebastien@unity3d.com> * Fix reflection probe framesettings override #796 * Force post process parent setting to be before child settings #799 * Fixed 1253367 by rebaking probe with missing baked texture. #818 * Fix issue with blocky artifacts when decals affecting metallic are applied on specular color workflow #823 * Fixed blend distance editing (1248931) #838 * Fix API breaking change: Add Public quality to Raytracing volume effect * Fix API breaking change: Add Public quality to Raytracing volume effect - RR * Update HDR information. Also updated format and links. (#853) * Fix message for metal and ao (#859) * d Fix issue with the blue line of prefab modifications for Volume mode #860 * Recompute FOV when generating PixelCoord To WorldSpace View Direction Matrix #865 * Upgrade default legacy terrain to HDRP default TerrainLit (#883) * Editing volumes via script doc (#884) * Added Volumes API doc * Update Volumes-API.md * Changed terminology back to Volume Override * Added terminology disclaimer * Update HDRenderPipeline.cs (#994) * Delete 9713_VirtualTexturing.meta * Fix SSAO with double sided material and normal mode to none #1043 * Fix emissive mesh layer mask behaviour #1062 * Use the wide mode to force the UI drawing on a single line (1251235) #1064 * Fix custom pass after post process buffer #1072 * Fix for area light baked data not updating when changing the gizmo #1075 * Fixed an error when switch area light shape to disk while an emissive… #1112 * Have the PBR Sky not render black when below horizon #1116 * Find the appropriate default frame settings per editor (case 1247631) #1129 * Fix taaFrameIndex and restore TAA tests for XR #534 * fix typo in the Render Pipeline Wizard #1037 * Add light layer on indirect lighting controller #777 * [8.x.x Backport] Fix exposure white flash when enabling SSR (#842) * fix white flash * changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com> * [8.x.x Backport] Fix transparent/opaque motion vector inconsistencies by allowing camera-only transparent motion vectors (#837) * port * changelog * Update HDRenderPipeline.cs Co-authored-by: sebastienlagarde <sebastien@unity3d.com> * [8.x.x Backport] Fix depth pyramid issues with dynamic resolution (#847) * Port * changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com> * [Backport 8.x.x] Fixed a serialization issue, preventing quality level parameters to undo/redo and update scene view on change. (#1105) * Fixed a serialization issue, preventing quality level parameters to undo/redo and update scene view on change. * Fixed issue when using Custom * Update changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com> * [Backport 8.x.x] Fixed Look Dev with Light Theme (#1106) * Fixed an issue where opening the look dev window with the light theme would make the window blink and eventually crash unity. # Conflicts: # com.unity.render-pipelines.core/Editor/LookDev/DisplayWindow.cs * Update changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com> * [Backport 8.x.x] Fixed decal duplication when editing a prefab in context (#1107) * Implemented proper culling for decals when used in prefabs and edited in context. * Compilation fix * Update changelog Co-authored-by: sebastienlagarde <sebastien@unity3d.com> * Fix API breaking change in indirect controller * Fix area light gizmo not updating engine side light v2 #1156 * Add missing ClothObj. * HDRP: Default indirect Lighting controller Layers to Everything to ease the migration * Update HDRenderPipelineResources.asset * Fixed logic of test on presence of HDRP asset that would wrongly trigger (#824) a warning message when not in batch mode. Co-authored-by: slunity <37302815+slunity@users.noreply.github.com> Co-authored-by: JordanL8 <lewis.jordan@hotmail.co.uk> Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com> Co-authored-by: Adrien de Tocqueville <adrien.tocqueville@unity3d.com> Co-authored-by: remi-chapelain <57442369+remi-chapelain@users.noreply.github.com> Co-authored-by: fredericv-unity3d <55485372+fredericv-unity3d@users.noreply.github.com> Co-authored-by: Fabien Houlmann <44069206+fabien-unity@users.noreply.github.com> Co-authored-by: Evgenii Golubev <EvgeniiG@users.noreply.github.com> Co-authored-by: JulienIgnace-Unity <julien@unity3d.com> Co-authored-by: Emmanuel Turquin <emmanuel@turquin.org>
Unity-Technologies · Jul 8, 2020 · 9af489a · 9af489a
1 parent 2aaf9d1
commit 9af489a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs b/com.unity.render-pipelines.high-definition/Editor/BuildProcessors/HDRPPreprocessShaders.cs
@@ -394,14 +394,17 @@ static void GetAllValidHDRPAssets()
             }
 
             // Prompt a warning if we find 0 HDRP Assets.
-            if (_hdrpAssets.Count == 0 && !Application.isBatchMode)
+            if (_hdrpAssets.Count == 0)
             {
-                if (EditorUtility.DisplayDialog("HDRP Asset missing", "No HDRP Asset has been set in the Graphic Settings, and no potential used in the build HDRP Asset has been found. If you want to continue compiling, this might lead to VERY long compilation time.", "Ok", "Cancel"))
-                    throw new UnityEditor.Build.BuildFailedException("Build canceled");
-            }
-            else
-            {
-                Debug.LogWarning("There is no HDRP Asset provided in GraphicsSettings. Build time can be extremely long without it.");
+                if (!Application.isBatchMode)
+                {
+                    if (EditorUtility.DisplayDialog("HDRP Asset missing", "No HDRP Asset has been set in the Graphic Settings, and no potential used in the build HDRP Asset has been found. If you want to continue compiling, this might lead to VERY long compilation time.", "Ok", "Cancel"))
+                        throw new UnityEditor.Build.BuildFailedException("Build canceled");
+                }
+                else
+                {
+                    Debug.LogWarning("There is no HDRP Asset provided in GraphicsSettings. Build time can be extremely long without it.");
+                }
             }
 
             /*

diff --git a/com.unity.render-pipelines.high-definition/Runtime/Lighting/IndirectLightingController.cs b/com.unity.render-pipelines.high-definition/Runtime/Lighting/IndirectLightingController.cs
@@ -12,12 +12,12 @@ public class IndirectLightingController : VolumeComponent
         /// <summary>Indirect diffuse lighting multiplier, between 0 and 1</summary>
         public MinFloatParameter indirectDiffuseIntensity = new MinFloatParameter(1.0f, 0.0f);
         /// Controls which layer will be affected by the indirect diffuse lighting multiplier 
-        public LightLayerEnumParameter indirectDiffuseLightingLayers = new LightLayerEnumParameter(LightLayerEnum.LightLayerDefault);
+        public LightLayerEnumParameter indirectDiffuseLightingLayers = new LightLayerEnumParameter(LightLayerEnum.Everything); // Default to everything to not have migration issue
 
         /// <summary>Reflection lighting multiplier, between 0 and 1</summary>
         public MinFloatParameter reflectionLightingMultiplier = new MinFloatParameter(1.0f, 0.0f);
         /// Controls which layer will be affected by the reflection lighting multiplier 
-        public LightLayerEnumParameter reflectionLightingLayers = new LightLayerEnumParameter(LightLayerEnum.LightLayerDefault);
+        public LightLayerEnumParameter reflectionLightingLayers = new LightLayerEnumParameter(LightLayerEnum.Everything); // Default to everything to not have migration issue
 
         /// <summary>Reflection probe intensity multiplier, between 0 and 1</summary>
         public MinFloatParameter indirectSpecularIntensity = new MinFloatParameter(1.0f, 0.0f);

diff --git a/...pipelines.high-definition/Runtime/RenderPipelineResources/HDRenderPipelineResources.asset b/...pipelines.high-definition/Runtime/RenderPipelineResources/HDRenderPipelineResources.asset
@@ -128,6 +128,8 @@ MonoBehaviour:
       type: 3}
     depthValuesPS: {fileID: 4800000, guid: 6e6a4a3dbb788234594aa74f2d6aeb6f, type: 3}
     colorResolvePS: {fileID: 4800000, guid: dd7047092f3c82b40b3a07868f9c4de2, type: 3}
+    resolveMotionVecPS: {fileID: 4800000, guid: ea18ca9826385e943979c46cf98968cc,
+      type: 3}
     copyAlphaCS: {fileID: 7200000, guid: c2c7eb6611725264187721ef9df0354b, type: 3}
     nanKillerCS: {fileID: 7200000, guid: 83982f199acf927499576a99abc9bea9, type: 3}
     exposureCS: {fileID: 7200000, guid: 976d7bce54fae534fb9ec67e9c18570c, type: 3}

diff --git a/com.unity.render-pipelines.high-definition/Samples~/MaterialSamples/Meshes/Cloth.obj b/com.unity.render-pipelines.high-definition/Samples~/MaterialSamples/Meshes/Cloth.obj