Merge pull request #94102 from Calinou/obj-import-fix-no-surfaces-error

Fix error message being printed when importing an OBJ with no surfaces
godotengine · Jul 8, 2024 · 6d2fe76 · 6d2fe76
2 parents c10fde6 + bbf6830
commit 6d2fe76
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/editor/import/3d/resource_importer_obj.cpp b/editor/import/3d/resource_importer_obj.cpp
@@ -425,9 +425,13 @@ static Error _parse_obj(const String &p_path, List<Ref<ImporterMesh>> &r_meshes,
  }
 
  if (!current_material.is_empty()) {
- mesh->set_surface_name(mesh->get_surface_count() - 1, current_material.get_basename());
+ if (mesh->get_surface_count() >= 1) {
+ mesh->set_surface_name(mesh->get_surface_count() - 1, current_material.get_basename());
+ }
  } else if (!current_group.is_empty()) {
- mesh->set_surface_name(mesh->get_surface_count() - 1, current_group);
+ if (mesh->get_surface_count() >= 1) {
+ mesh->set_surface_name(mesh->get_surface_count() - 1, current_group);
+ }
  }
  Array array = surf_tool->commit_to_arrays();