Skip to content

Commit 75f4859

Browse files
committed
Fix NRE on nameless materials
1 parent 84ee7e2 commit 75f4859

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

Runtime/GLTFastWrappers/DecentralandMaterialGenerator.cs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,16 @@ private void SetMaterialName(int materialIndex, GLTFastMaterial gltfMaterial)
8282
{
8383
material.name = "material";
8484

85-
if (gltfMaterial.name.Contains("skin", StringComparison.InvariantCultureIgnoreCase))
86-
material.name += "_skin";
85+
string originalName = gltfMaterial.name;
8786

88-
if (gltfMaterial.name.Contains("hair", StringComparison.InvariantCultureIgnoreCase))
89-
material.name += "_hair";
87+
if (!string.IsNullOrEmpty(originalName))
88+
{
89+
if (originalName.Contains("skin", StringComparison.InvariantCultureIgnoreCase))
90+
material.name += "_skin";
91+
92+
if (originalName.Contains("hair", StringComparison.InvariantCultureIgnoreCase))
93+
material.name += "_hair";
94+
}
9095

9196
material.name += $"_{materialIndex}";
9297
}

0 commit comments

Comments
 (0)