maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #38109 from nekomatata/mesh-instance-active-material

Browse source 
Fix get_active_material when a material is directly set on the mesh
This commit is contained in:
Rémi Verschelde 2020-04-23 12:42:11 +02:00 committed by GitHub
parent ffe07d9332 72ee09082c
commit a800048071
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scene/3d/mesh_instance_3d.cpp
View file

@ -307,19 +307,22 @@ Ref<Material> MeshInstance3D::get_surface_material(int p_surface) const {
Ref<Material> MeshInstance3D::get_active_material(int p_surface) const {
if (get_material_override() != Ref<Material>()) {
return get_material_override();
} else if (p_surface < materials.size()) {
return materials[p_surface];
} else {
Ref<Mesh> mesh = get_mesh();
Ref<Material> material_override = get_material_override();
if (material_override.is_valid()) {
return material_override;
}
if (mesh.is_null() || p_surface >= mesh->get_surface_count()) {
return Ref<Material>();
}
Ref<Material> surface_material = get_surface_material(p_surface);
if (surface_material.is_valid()) {
return surface_material;
}
Ref<Mesh> mesh = get_mesh();
if (mesh.is_valid()) {
return mesh->surface_get_material(p_surface);
}
return Ref<Material>();
}
void MeshInstance3D::_mesh_changed() {