Merge pull request #50764 from AndreaCatania/AndreaCatania-patch-4

Fix GLTF crash when the material is not set.
godotengine · Jul 23, 2021 · 78dae32 · 78dae32
2 parents 995093f + 2cd347f
commit 78dae32
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp
@@ -2796,7 +2796,7 @@ Error GLTFDocument::_parse_meshes(Ref<GLTFState> state) {
 				mat = mat3d;
 			}
 
-			import_mesh->add_surface(primitive, array, morphs, Dictionary(), mat, mat->get_name());
+			import_mesh->add_surface(primitive, array, morphs, Dictionary(), mat, mat.is_valid() ? mat->get_name() : String());
 		}
 
 		Vector<float> blend_weights;