From 6cf8c91014dd7c9138f6b35ecac3eeb12b91ff62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Leli=C3=A8vre?= Date: Fri, 19 Jun 2020 11:37:47 +0200 Subject: [PATCH 1/3] Fixed Receive SSR transparent nullref --- .../Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs index 8478ce8d074..687e836e7d5 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs @@ -747,7 +747,7 @@ void DrawLitSurfaceOptions() materialEditor.ShaderProperty(supportDecals, Styles.supportDecalsText); } - if (receivesSSR != null) + if (receivesSSR != null && receivesSSRTransparent != null) { // Based on the surface type, display the right recieveSSR option if (surfaceTypeValue == SurfaceType.Transparent) From dc97a6b8dd6d6a178c0ad21418d2fba8e6553a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Leli=C3=A8vre?= Date: Fri, 19 Jun 2020 11:38:04 +0200 Subject: [PATCH 2/3] Fixed terrain and axf nullref --- .../Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs index 687e836e7d5..9ed4b3bda52 100644 --- a/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs +++ b/com.unity.render-pipelines.high-definition/Editor/Material/UIBlocks/SurfaceOptionUIBlock.cs @@ -545,7 +545,7 @@ void DrawSurfaceGUI() else // SurfaceType.Opaque { EditorGUI.indentLevel++; - if (doubleSidedEnable.floatValue == 0) + if (doubleSidedEnable != null && doubleSidedEnable.floatValue == 0 && opaqueCullMode != null) materialEditor.ShaderProperty(opaqueCullMode, Styles.opaqueCullModeText); EditorGUI.indentLevel--; if (HDRenderQueue.k_RenderQueue_AfterPostProcessOpaque.Contains(renderQueue)) From 944cfac29bafd8b15052a3de294c8c0094f3374d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Leli=C3=A8vre?= Date: Fri, 19 Jun 2020 11:39:39 +0200 Subject: [PATCH 3/3] Updated changelog --- com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index 60c2d8de69c..82e1442dfbf 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -691,6 +691,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed ray tracing with XR single-pass. - Fixed warning in HDAdditionalLightData OnValidate (cases 1250864, 1244578) - Fixed a bug related to denoising ray traced reflections. +- Fixed nullref in the layered lit material inspector. ### Changed - Improve MIP selection for decals on Transparents