Merge 7.x.x/hd/staging (#2635)

* Added a warning when trying to bake with static lighting being in an invalid state.

* Fix light resolution scalable settings in the Light Explorer #2470

* Better tooltip for exposure weight on emission fields. #1821

* Fix rendering of custom passes in the Custom Pass Volume inspector #1824

* Updated the implementation details for pb sky (#1872)

* Add disclaimer about object motion vectors not working in the scene view (#1900)

* Update Render-Pipeline-Debug-Window.md

* Update Render-Pipeline-Debug-Window.md

* Fix double addition to sorted volume lists #1916

* fix case 1244430 removing camera comp from prefab #1953

* Fix nan in the pbr sky #1983

* [HDRP][LookDev] Ensure stylesheet are loaded before applying them on Domain Reload (#1985)

* Fix Custom Post Process affecting preview cameras #1988

* Fix matcap preferences serialization issue #2013

* Remove XRSystemTests #2241

* HDRP - Fix XR shadows culling #2263

* Adding support for CloudRendering to HDRP #2436

* Fix volument component creation via script #2369

* [Backport 7.x.x] Fix issue with previous frame exposure texture being not null, but containing garbage (#2620)

* Fix

* Changelog

Co-authored-by: sebastienlagarde <[email protected]>

* [Backport 7.x.x] Fixed error Maximum allowed thread group count is 65535 when resolution is very high (#2622)

* Fix

* changelog

Co-authored-by: sebastienlagarde <[email protected]>

Co-authored-by: JulienIgnace-Unity <[email protected]>
Co-authored-by: Adrien de Tocqueville <[email protected]>
Co-authored-by: FrancescoC-unity <[email protected]>
Co-authored-by: JordanL8 <[email protected]>
Co-authored-by: Martin Thorzen <[email protected]>
Co-authored-by: jenniferd-unity <[email protected]>
Co-authored-by: Antoine Lelievre <[email protected]>
Co-authored-by: Fabien Houlmann <[email protected]>
Co-authored-by: Andrew Spiering <[email protected]>

Author: 10 people

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

@@ -216,24 +216,48 @@ event Action IViewDisplayer.OnUpdateRequested
         StyleSheet styleSheet = null;
         StyleSheet styleSheetLight = null;
 
-        void OnEnable()
+        void ReloadStyleSheets()
         {
-            //Stylesheet
-            // Try to load stylesheet. Timing can be odd while upgrading packages (case 1219692).
-            // In this case, it will be fixed in OnGUI. Though it can spawn error while reimporting assets.
-            // Waiting for filter on stylesheet (case 1228706) to remove last error.
-            if (styleSheet == null || styleSheet.Equals(null))
+            if(styleSheet == null || styleSheet.Equals(null))
             {
                 styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>(Style.k_uss);
-                if (styleSheet != null && !styleSheet.Equals(null))
-                    rootVisualElement.styleSheets.Add(styleSheet);
+                if(styleSheet == null || styleSheet.Equals(null))
+                {
+                    //Debug.LogWarning("[LookDev] Could not load Stylesheet.");
+                    return;
+                }
             }
-            if (!EditorGUIUtility.isProSkin && styleSheetLight != null && !styleSheetLight.Equals(null))
+
+            if(!rootVisualElement.styleSheets.Contains(styleSheet))
+                rootVisualElement.styleSheets.Add(styleSheet);
+
+            //Additively load Light Skin
+            if(!EditorGUIUtility.isProSkin)
             {
-                styleSheetLight = AssetDatabase.LoadAssetAtPath<StyleSheet>(Style.k_uss_personal_overload);
-                if (styleSheetLight != null && !styleSheetLight.Equals(null))
+                if(styleSheetLight == null || styleSheetLight.Equals(null))
+                {
+                    styleSheetLight = AssetDatabase.LoadAssetAtPath<StyleSheet>(Style.k_uss_personal_overload);
+                    if(styleSheetLight == null || styleSheetLight.Equals(null))
+                    {
+                        //Debug.LogWarning("[LookDev] Could not load Light skin.");
+                        return;
+                    }
+                }
+                 
+                if(!rootVisualElement.styleSheets.Contains(styleSheetLight))
                     rootVisualElement.styleSheets.Add(styleSheetLight);
             }
+        }
+
+        void OnEnable()
+        {
+            //Stylesheet
+            // Try to load stylesheet. Timing can be odd while upgrading packages (case 1219692).
+            // In this case, it will be fixed in OnGUI. Though it can spawn error while reimporting assets.
+            // Waiting for filter on stylesheet (case 1228706) to remove last error.
+            // On Editor Skin change, OnEnable is called and stylesheets need to be reloaded (case 1278802).
+            if(EditorApplication.isUpdating)
+                ReloadStyleSheets();
 
             //Call the open function to configure LookDev
             // in case the window where open when last editor session finished.
@@ -681,14 +705,11 @@ void OnGUI()
                 //        rootVisualElement.styleSheets.Add(styleSheetLight);
                 //}
             }
-            else
-            {
-                //deal with missing style when domain reload...
-                if (!rootVisualElement.styleSheets.Contains(styleSheet))
-                    rootVisualElement.styleSheets.Add(styleSheet);
-                if (!EditorGUIUtility.isProSkin && !rootVisualElement.styleSheets.Contains(styleSheetLight))
-                    rootVisualElement.styleSheets.Add(styleSheetLight);
-            }
+            if(EditorApplication.isUpdating)
+                return;
+           
+            //deal with missing style on domain reload...
+            ReloadStyleSheets();
 
             // [case 1245086] Guard in case the SRP asset is set to null (or to a not supported SRP) when the lookdev window is already open
             // Note: After an editor reload, we might get a null OnUpdateRequestedInternal and null SRP for a couple of frames, hence the check.

com.unity.render-pipelines.core/Runtime/Volume/VolumeManager.cs

@@ -124,7 +124,8 @@ public void Register(Volume volume, int layer)
             // Look for existing cached layer masks and add it there if needed
             foreach (var kvp in m_SortedVolumes)
             {
-                if ((kvp.Key & (1 << layer)) != 0)
+                // We add the volume to sorted lists only if the layer match and if it doesn't contain the volume already.
+                if ((kvp.Key & (1 << layer)) != 0 && !kvp.Value.Contains(volume))
                     kvp.Value.Add(volume);
             }
 

com.unity.render-pipelines.core/Runtime/Volume/VolumeProfile.cs

@@ -75,6 +75,10 @@ public VolumeComponent Add(Type type, bool overrides = false)
                 throw new InvalidOperationException("Component already exists in the volume");
 
             var component = (VolumeComponent)CreateInstance(type);
+#if UNITY_EDITOR
+            component.hideFlags = HideFlags.HideInInspector | HideFlags.HideInHierarchy;
+            component.name = type.Name;
+#endif
             component.SetAllOverridesTo(overrides);
             components.Add(component);
             isDirty = true;

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -6,8 +6,26 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [7.5.2] - 2020-09-14
 
+### Added
+- Added a warning when trying to bake with static lighting being in an invalid state.
+
 ### Fixed
 - Fixed a null ref exception when baking reflection probes.
+- Fixed shadow resolution settings level in the light explorer.
+- Fixed rendering of custom passes in the Custom Pass Volume inspector
+- Fixed issue with volume manager trying to access a null volume.
+- Fixed an issue that caused a null reference when deleting camera component in a prefab. (case 1244430)
+- Fixed nan in pbr sky
+- Fixed Light skin not properly applied on the LookDev when switching from Dark Skin (case 1278802)
+- Fixed Custom Post Processes affecting preview cameras.
+- Fixed serialization issue with matcap scale intensity.
+- Fixed XR shadows culling
+- Fixed volument component creation via script.
+- Fixed issue with exposure history being uninitialized on second frame.
+- Fixed error Maximum allowed thread group count is 65535 when resolution is very high. 
+
+### Changed
+- Removed XRSystemTests. The GC verification is now done during playmode tests (case 1285012).
 
 ## [7.5.1] - 2020-09-02
 

com.unity.render-pipelines.high-definition/Documentation~/Override-Physically-Based-Sky.md

@@ -106,7 +106,7 @@ To make this section visible, disable **Earth Preset**.
 
 This sky type is a practical implementation of the method outlined in the paper [Precomputed Atmospheric Scattering](http://www-ljk.imag.fr/Publications/Basilic/com.lmc.publi.PUBLI_Article@11e7cdda2f7_f64b69/article.pdf) (Bruneton and Neyret, 2008).
 
-This technique assumes that you always view the Scene from above the surface of the planet. This means that if you go below the planet's surface, the sky renders black. Where the surface of the planet is depends on whether you enable or disable **Spherical Mode**:
+This technique assumes that you always view the Scene from above the surface of the planet. This means that if a camera goes below the planet's surface, the sky renders as it would do if the camera was at ground level. Where the surface of the planet is depends on whether you enable or disable **Spherical Mode**:
 
 * If you enable **Spherical Mode**, the **Planetary Radius** and **Planet Center Position** properties define where the surface is. In this mode, the surface is at the distance set in **Planetary Radius** away from the position set in **Planet Center Position**.
 * Otherwise, the **Sea Level** property defines where the surface is. In this mode, the surface stretches out infinitely on the xz plane and **Sea Level** sets its world space height.

com.unity.render-pipelines.high-definition/Documentation~/Render-Pipeline-Debug-Window.md

@@ -140,7 +140,7 @@ The **Rendering** panel has tools that you can use to visualize various HDRP ren
 
 | **Debug Option**              | **Description**                                              |
 | ----------------------------- | ------------------------------------------------------------ |
-| **Fullscreen Debug Mode**     | Use the drop-down to select a rendering mode to display as an overlay on the screen.<br/>&#8226; **Motion Vectors**: Select this option to display motion vectors.<br/>&#8226; **NaN Tracker**: Select this option to display an overlay that highlights [NaN](<https://en.wikipedia.org/wiki/NaN>) values. |
+| **Fullscreen Debug Mode**     | Use the drop-down to select a rendering mode to display as an overlay on the screen.<br/>&#8226; **Motion Vectors**: Select this option to display motion vectors. Note that object motion vectors are not visible in the Scene view.<br/>&#8226; **NaN Tracker**: Select this option to display an overlay that highlights [NaN](<https://en.wikipedia.org/wiki/NaN>) values. |
 | **MipMaps**                   | Use the drop-down to select a mipmap streaming property to debug.<br/>&#8226; **None**: Select this option to disable this debug feature.<br/>&#8226; **MipRatio**: Select this option to display a heat map of pixel to texel ratio. A blue tint represents areas with too little Texture detail (the Texture is too small). A bed tint represents areas with too much Texture detail (the Texture is too large for the screen area). If the debugger shows the original colour for a pixel, this means that the level of detail is just right.<br/>&#8226; **MipCount**: Select this option to display mip count as grayscale from black to white as the number of mips increases (for up to 14 mips, or 16K size). Red inidates Textures with more than 14 mips. Magenta indicates Textures with 0 mips or that the Shader does not support mip count.<br/>&#8226; **MipCountReduction**: Select this option to display the difference between the current mip count and the original mip count as a green scale. A brighter green represents a larger reduction (that mip streaming saves more Texture memory). Magenta means that the debugger does not know the original mip count.<br/>&#8226; **StreamingMipBudget**: Select this option to display the mip status due to streaming budget. Green means that streaming Textures saves some memory. Red means that mip levels are lower than is optimal, due to full Texture memory budget. White means that streaming Textures saves no memory.<br/>&#8226; **StreamingMip**: Select this option to display the same information as **StreamingMipBudget**, but to apply the colors to the original Textures. |
 | **- Terrain Texture**         | Use the drop-down to select the terrain Texture to debug the mipmap for. This property only appears when you select an option other than **None** from the **MipMaps** drop-down. |
 | **Color Picker - Debug Mode** | Use the drop-down to select the format of the color picker display. |

com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightExplorerExtension.cs

@@ -426,7 +426,7 @@ protected virtual LightingExplorerTableColumn[] GetHDLightColumns()
                     var shadowResolution = lightData.shadowResolution;
 
                     EditorGUI.BeginChangeCheck();
-                    var (level, useOverride) = SerializedScalableSettingValueUI.LevelFieldGUI(r, GUIContent.none, ScalableSettingSchema.GetSchemaOrNull(ScalableSettingSchemaId.With3Levels), shadowResolution.level, shadowResolution.useOverride);
+                    var (level, useOverride) = SerializedScalableSettingValueUI.LevelFieldGUI(r, GUIContent.none, ScalableSettingSchema.GetSchemaOrNull(ScalableSettingSchemaId.With4Levels), shadowResolution.level, shadowResolution.useOverride);
                     if (EditorGUI.EndChangeCheck())
                     {
                         Undo.RecordObject(lightData, "Changed contact shadow resolution");

com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/DecalSurfaceInputsUIBlock.cs

@@ -34,7 +34,7 @@ public class Styles
             public static GUIContent useEmissionIntensityText = new GUIContent("Use Emission Intensity", "When enabled, this Material separates emission color and intensity. This makes the Emission Map into an LDR color and exposes the Emission Intensity property.");
             public static GUIContent emissionMapText = new GUIContent("Emission Map", "Specifies a map (RGB) that the Material uses for emission.");
             public static GUIContent emissiveIntensityText = new GUIContent("Emission Intensity", "Sets the overall strength of the emission effect.");
-            public static GUIContent emissiveExposureWeightText = new GUIContent("Exposure weight", "Control the percentage of emission to expose.");
+            public static GUIContent emissiveExposureWeightText = new GUIContent("Exposure weight", "Controls how the camera exposure influences the perceived intensity of the emissivity. A weight of 0 means that the emissive intensity is calculated ignoring the exposure; increasing this weight progressively increases the influence of exposure on the final emissive value.");
 
             public static GUIContent[] maskMapText =
             {

com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/EmissionUIBlock.cs

@@ -27,7 +27,7 @@ public class Styles
             public static GUIContent useEmissiveIntensityText = new GUIContent("Use Emission Intensity", "Specifies whether to use to a HDR color or a LDR color with a separate multiplier.");
             public static GUIContent emissiveIntensityText = new GUIContent("Emission Intensity", "");
             public static GUIContent emissiveIntensityFromHDRColorText = new GUIContent("The emission intensity is from the HDR color picker in luminance", "");
-            public static GUIContent emissiveExposureWeightText = new GUIContent("Exposure weight", "Control the percentage of emission to expose.");
+            public static GUIContent emissiveExposureWeightText = new GUIContent("Exposure weight", "Controls how the camera exposure influences the perceived intensity of the emissivity. A weight of 0 means that the emissive intensity is calculated ignoring the exposure; increasing this weight progressively increases the influence of exposure on the final emissive value.");
 
             public static GUIContent UVEmissiveMappingText = new GUIContent("Emission UV mapping", "");
             public static GUIContent texWorldScaleText = new GUIContent("World Scale", "Sets the tiling factor HDRP applies to Planar/Trilinear mapping.");

com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDCameraEditor.cs

@@ -77,15 +77,32 @@ public void RemoveComponent(Camera camera, IEnumerable<Component> dependencies)
                 return;
             }
 
-            Undo.SetCurrentGroupName("Remove HD Camera");
-            var additionalCameraData = camera.GetComponent<HDAdditionalCameraData>();
-            if (additionalCameraData)
+            var isAssetEditing = EditorUtility.IsPersistent(camera);
+            try
             {
-                Undo.DestroyObjectImmediate(additionalCameraData);
+                if (isAssetEditing)
+                {
+                    AssetDatabase.StartAssetEditing();
+                }
+
+                Undo.SetCurrentGroupName("Remove HD Camera");
+                var additionalCameraData = camera.GetComponent<HDAdditionalCameraData>();
+                if (additionalCameraData != null)
+                {
+                    Undo.DestroyObjectImmediate(additionalCameraData);
+                }
+
+                Undo.DestroyObjectImmediate(camera);
+            }
+            finally
+            {
+                if (isAssetEditing)
+                {
+                    AssetDatabase.StopAssetEditing();
+                }
             }
-            Undo.DestroyObjectImmediate(camera);
         }
-        
+
         [MenuItem("CONTEXT/Camera/Reset", false, 0)]
         static void ResetCamera(MenuCommand menuCommand)
         {