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

akien-mga · akien-mga · commit 6d2fe76084d8 · 2024-07-09T00:03:26.000+02:00
Fix error message being printed when importing an OBJ with no surfaces
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();
 

Original file line number	Diff line number	Diff line change
`@@ -425,9 +425,13 @@ static Error _parse_obj(const String &p_path, List<Ref<ImporterMesh>> &r_meshes,`
`425`	`425`	`}`
`426`	`426`
`427`	`427`	`if (!current_material.is_empty()) {`
`428`		`- mesh->set_surface_name(mesh->get_surface_count() - 1, current_material.get_basename());`
	`428`	`+ if (mesh->get_surface_count() >= 1) {`
	`429`	`+ mesh->set_surface_name(mesh->get_surface_count() - 1, current_material.get_basename());`
	`430`	`+ }`
`429`	`431`	`} else if (!current_group.is_empty()) {`
`430`		`- mesh->set_surface_name(mesh->get_surface_count() - 1, current_group);`
	`432`	`+ if (mesh->get_surface_count() >= 1) {`
	`433`	`+ mesh->set_surface_name(mesh->get_surface_count() - 1, current_group);`
	`434`	`+ }`
`431`	`435`	`}`
`432`	`436`	`Array array = surf_tool->commit_to_arrays();`
`433`	`437`