Skip to content

Fix potential NullReferenceException in URP/HDRP/SG material import #5840

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

Closed
wants to merge 1 commit into from
Closed

Fix potential NullReferenceException in URP/HDRP/SG material import #5840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions com.unity.render-pipelines.high-definition/Editor/AssetProcessors/MaterialPostProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,8 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse
// Materials (.mat) post processing:

var material = (Material)AssetDatabase.LoadAssetAtPath(asset, typeof(Material));
if (material == null)
continue;
Comment on lines +337 to +338
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should threat this an exception or log error. It feels risky we silently fail to process a material.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point, I'm not sure. As I don't have a repro case, I'm working under the impression that these are not really materials, but some other assets that happen to have a .mat extension. But I'm not sure if that's even allowed or makes sense in any valid use case. Does unity have strict 1:1 mapping between asset file extensions and asset types? Perhaps this needs some deeper investigation...


if (MaterialReimporter.s_ReimportShaderGraphDependencyOnMaterialUpdate && GraphUtil.IsShaderGraphAsset(material.shader))
{
Expand Down
3 changes: 3 additions & 0 deletions com.unity.render-pipelines.universal/Editor/AssetPostProcessors/MaterialPostprocessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse
// this skips any materials that only target other render pipelines, are user shaders,
// or are shaders we don't care to version
var material = (Material)AssetDatabase.LoadAssetAtPath(asset, typeof(Material));
if (material == null)
continue;

var shaderID = GetShaderID(material.shader);
if (shaderID == ShaderID.Unknown)
continue;
Expand Down
3 changes: 3 additions & 0 deletions ...aph/Editor/Generation/Targets/BuiltIn/Editor/AssetPostProcessors/MaterialPostprocessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse
// This skips any materials that only target other render pipelines, are user shaders,
// or are shaders we don't care to version
var material = (Material)AssetDatabase.LoadAssetAtPath(asset, typeof(Material));
if (material == null)
continue;

var shaderID = GetShaderID(material.shader);
if (shaderID == ShaderID.Unknown)
continue;
Expand Down