Skip to content

Fix nullref in layered lit editor #3460

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.

Sign up for GitHub

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 2 commits into from
Feb 10, 2021
Merged

Fix nullref in layered lit editor #3460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09a1eda
Fix nullref
adrien-de-tocqueville Feb 10, 2021
0ed5e19
Merge branch 'hd/bugfix' into hd/fix-layeredlit-nullref
sebastienlagarde Feb 10, 2021
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.high-definition/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed model import by adding additional data if needed.
- Fix screen being over-exposed when changing very different skies.
- Fixed incorrect debug wireframe overlay on tessellated geometry (using littessellation), caused by the picking pass using an incorrect camera matrix.
- Fixed nullref in layered lit shader editor.

### Changed
- Changed Window/Render Pipeline/HD Render Pipeline Wizard to Window/Rendering/HDRP Wizard
Expand Down
2 changes: 1 addition & 1 deletion com.unity.render-pipelines.high-definition/Editor/Material/LayeredLit/LayeredLitGUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ public static void InitializeMaterialLayers(AssetImporter materialImporter, ref
layers[i] = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath(layersGUID.GUIDArray[i]), typeof(Material)) as Material;
}
}
if (layersGUID.withUV.Length > 0)
if (layersGUID.withUV != null && layersGUID.withUV.Length > 0)
{
withUV = new bool[layersGUID.withUV.Length];
for (int i = 0; i < layersGUID.withUV.Length; ++i)
Expand Down