blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Fix T100017: OBJ: new importer does not import vertices that aren't part of any face 

The Python based importer had a special case handling of "no faces in
the whole file at all", where it ended up treating the whole file
as essentially a point-cloud-like object (just loose vertices, no
faces or edges). The new importer code was missing this special case.

Fixes T100017. Added gtest coverage that was failing without the fix.

# Conflicts:
#	source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc
This commit is contained in:
Aras Pranckevicius 2022-07-28 16:39:42 +03:00
parent f11dc58667
commit c857405c0d
Notes: blender-bot 2023-06-21 19:23:24 +02:00 
Referenced by issue #100074, Regression: UI freeze for Render Animation AND changing frame being previewed
Referenced by issue #100017, OBJ: new importer does not import vertices that aren't part of any face
Referenced by issue #98661, 3.2: Potential candidates for corrective releases
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc
View File

@ -13,6 +13,8 @@
#include "obj_import_file_reader.hh"
#include <algorithm>
namespace blender::io::obj {
using std::string;
@ -322,6 +324,23 @@ static bool parse_keyword(StringRef &line, StringRef keyword)
return true;
}
/* Special case: if there were no faces/edges in any geometries,
* treat all the vertices as a point cloud. */
static void use_all_vertices_if_no_faces(Geometry *geom,
const Vector<std::unique_ptr<Geometry>> &all_geometries,
const GlobalVertices &global_vertices)
{
if (!global_vertices.vertices.is_empty() && geom && geom->geom_type_ == GEOM_MESH) {
if (std::all_of(
all_geometries.begin(), all_geometries.end(), [](const std::unique_ptr<Geometry> &g) {
return g->get_vertex_count() == 0;
})) {
geom->track_vertex_index(0);
geom->track_vertex_index(global_vertices.vertices.size() - 1);
}
}
}
void OBJParser::parse(Vector<std::unique_ptr<Geometry>> &r_all_geometries,
GlobalVertices &r_global_vertices)
{
@ -493,6 +512,7 @@ void OBJParser::parse(Vector<std::unique_ptr<Geometry>> &r_all_geometries,
buffer_offset = left_size;
}
use_all_vertices_if_no_faces(curr_geom, r_all_geometries, r_global_vertices);
add_default_mtl_library();
}

10
source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
View File

@ -522,4 +522,14 @@ TEST_F(obj_importer_test, import_all_objects)
import_and_check("all_objects.obj", expect, std::size(expect), 7);
}
TEST_F(obj_importer_test, import_vertices)
{
Expectation expect[] = {
{"OBCube", OB_MESH, 8, 12, 6, 24, float3(1, 1, -1), float3(-1, 1, 1)},
/* Loose vertices without faces or edges. */
{"OBCube.001", OB_MESH, 8, 0, 0, 0, float3(1, 1, -1), float3(-1, 1, 1)},
};
import_and_check("vertices.obj", expect, std::size(expect), 0);
}
} // namespace blender::io::obj