Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #92986 from Repiteo/core/ref-instantiate-integration

Browse source 
Core: Integrate Ref `instantiate` where possible
This commit is contained in:
Thaddeus Crews 2024-11-11 14:18:15 -06:00
commit 9be806aef1
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
44 changed files with 81 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/gltf/gltf_document.cpp
View file

@ -117,7 +117,7 @@ static Ref<ImporterMesh> _mesh_to_importer_mesh(Ref<Mesh> p_mesh) {
mat_name = mat->get_name();
} else {
// Assign default material when no material is assigned.
mat = Ref<StandardMaterial3D>(memnew(StandardMaterial3D));
mat.instantiate();
}
importer_mesh->add_surface(p_mesh->surface_get_primitive_type(surface_i),
array, p_mesh->surface_get_blend_shape_arrays(surface_i), p_mesh->surface_get_lods(surface_i), mat,
@ -5913,7 +5913,7 @@ void GLTFDocument::_convert_csg_shape_to_gltf(CSGShape3D *p_current, GLTFNodeInd
mat_name = mat->get_name();
} else {
// Assign default material when no material is assigned.
mat = Ref<StandardMaterial3D>(memnew(StandardMaterial3D));
mat.instantiate();
}
mesh->add_surface(csg_mesh->surface_get_primitive_type(surface_i),