From 15999f1574340a04d540babdfe88c65b2a83ad55 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 15 Jul 2020 12:15:34 +0200 Subject: [PATCH 1/3] Fixed a null ref in the volume component list when there is no volume components in the project --- com.unity.render-pipelines.core/Editor/FilterWindow.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/com.unity.render-pipelines.core/Editor/FilterWindow.cs b/com.unity.render-pipelines.core/Editor/FilterWindow.cs index 514b15fd672..44f06c95e32 100644 --- a/com.unity.render-pipelines.core/Editor/FilterWindow.cs +++ b/com.unity.render-pipelines.core/Editor/FilterWindow.cs @@ -455,8 +455,11 @@ void HandleKeyboard() if (evt.keyCode == KeyCode.Return || evt.keyCode == KeyCode.KeypadEnter) { - GoToChild(m_ActiveElement, true); - evt.Use(); + if (m_ActiveElement != null) + { + GoToChild(m_ActiveElement, true); + evt.Use(); + } } // Do these if we're not in search mode From eb1bbc289ca025de06b87da485a0968dba175ae7 Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 15 Jul 2020 12:16:25 +0200 Subject: [PATCH 2/3] Update 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 f65a221d12d..e523303bf7d 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -731,6 +731,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed path-traced subsurface scattering mixing with diffuse and specular BRDFs (1250601). - Fixed custom pass re-ordering issues. - Improved robustness of normal mapping when scale is 0, and mapping is extreme (normals in or below the tangent plane). +- Fixed a null ref in the volume component list when there is no volume components in the project. ### Changed - Improve MIP selection for decals on Transparents From ccc47d3de5047352539b43b17988849150dd8d9e Mon Sep 17 00:00:00 2001 From: Julien Ignace Date: Wed, 15 Jul 2020 13:35:20 +0200 Subject: [PATCH 3/3] Fixed changelog --- com.unity.render-pipelines.core/CHANGELOG.md | 1 + com.unity.render-pipelines.high-definition/CHANGELOG.md | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/com.unity.render-pipelines.core/CHANGELOG.md b/com.unity.render-pipelines.core/CHANGELOG.md index c52d9f511f7..8ab794d2070 100644 --- a/com.unity.render-pipelines.core/CHANGELOG.md +++ b/com.unity.render-pipelines.core/CHANGELOG.md @@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fix LookDev's undo/redo on EnvironmentLibrary (case 1234725) - Fix a compil error on OpenGL ES2 in directional lightmap sampling shader code - Fix hierarchicalbox gizmo outside facing check in symetry or homothety mode no longer move the center +- Fixed a null ref in the volume component list when there is no volume components in the project. ### Changed - Restored usage of ENABLE_VR to fix compilation errors on some platforms. diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index e523303bf7d..f65a221d12d 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -731,7 +731,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed path-traced subsurface scattering mixing with diffuse and specular BRDFs (1250601). - Fixed custom pass re-ordering issues. - Improved robustness of normal mapping when scale is 0, and mapping is extreme (normals in or below the tangent plane). -- Fixed a null ref in the volume component list when there is no volume components in the project. ### Changed - Improve MIP selection for decals on Transparents