Skip to content

Fixed a null ref in the volume component list when there is no volume components in the project #1282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions com.unity.render-pipelines.core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 5 additions & 2 deletions com.unity.render-pipelines.core/Editor/FilterWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down