godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Fix MeshInstance3D::get_active_material() error on empty mesh or empty surfaces

Browse Source 
FixesMeshInstance3D::get_active_material() error on empty mesh or empty surfaces.
This commit is contained in:
smix8
2025-06-19 02:55:54 +02:00
parent 8de08c7c21
commit 4bbafc8d0e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scene/3d/mesh_instance_3d.cpp
View File

@@ -380,19 +380,19 @@ Ref<Material> MeshInstance3D::get_active_material(int p_surface) const {
return mat_override; return mat_override;
} }
Ref<Mesh> m = get_mesh();
if (m.is_null() || m->get_surface_count() == 0) {
return Ref<Material>();
}
Ref<Material> surface_material = get_surface_override_material(p_surface); Ref<Material> surface_material = get_surface_override_material(p_surface);
if (surface_material.is_valid()) { if (surface_material.is_valid()) {
return surface_material; return surface_material;
} }
Ref<Mesh> m = get_mesh();
if (m.is_valid()) {
return m->surface_get_material(p_surface); return m->surface_get_material(p_surface);
} }
return Ref<Material>();
}
void MeshInstance3D::_mesh_changed() { void MeshInstance3D::_mesh_changed() {
ERR_FAIL_COND(mesh.is_null()); ERR_FAIL_COND(mesh.is_null());
const int surface_count = mesh->get_surface_count(); const int surface_count = mesh->get_surface_count();