blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

OBJ: fix mac/linux tests and compile warnings in the new obj importer 

Related to D13958
This commit is contained in:
Aras Pranckevicius 2022-04-04 14:58:45 +03:00
parent 277fa2f441
commit a56f53ad56
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,6 +184,10 @@ static void geom_add_polygon(Geometry *geom,
}
}
}
else {
fprintf(stderr, "Invalid face syntax '%s', ignoring\n", std::string(str_corner).c_str());
face_valid = false;
}
/* Always keep stored indices non-negative and zero-based. */
corner.vert_index += corner.vert_index < 0 ? global_vertices.vertices.size() :
-offsets.get_index_offset() - 1;
@ -191,7 +195,7 @@ static void geom_add_polygon(Geometry *geom,
fprintf(stderr,
"Invalid vertex index %i (valid range [0, %zi)), ignoring face\n",
corner.vert_index,
global_vertices.vertices.size());
(size_t)global_vertices.vertices.size());
face_valid = false;
}
if (got_uv) {
@ -200,7 +204,7 @@ static void geom_add_polygon(Geometry *geom,
fprintf(stderr,
"Invalid UV index %i (valid range [0, %zi)), ignoring face\n",
corner.uv_vert_index,
global_vertices.uv_vertices.size());
(size_t)global_vertices.uv_vertices.size());
face_valid = false;
}
}
@ -213,7 +217,7 @@ static void geom_add_polygon(Geometry *geom,
fprintf(stderr,
"Invalid normal index %i (valid range [0, %zi)), ignoring face\n",
corner.vertex_normal_index,
global_vertices.vertex_normals.size());
(size_t)global_vertices.vertex_normals.size());
face_valid = false;
}
}

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

@ -338,8 +338,8 @@ TEST_F(obj_importer_test, import_invalid_syntax)
3,
float3(1, 2, 3),
float3(10, 11, 12),
float3(0.4082f, -0.8165f, 0.4082f),
float2(0, 0)},
float3(0, 1, 0),
float2(0.5f, 0.25f)},
};
import_and_check("invalid_syntax.obj", expect, std::size(expect), 0);
}