Merge branch 'blender-v3.2-release'
This commit is contained in:
commit
48f7574716
|
@ -128,6 +128,7 @@ static void geom_add_polygon(Geometry *geom,
|
|||
curr_face.start_index_ = orig_corners_size;
|
||||
|
||||
bool face_valid = true;
|
||||
line = drop_whitespace(line);
|
||||
while (!line.is_empty() && face_valid) {
|
||||
PolyCorner corner;
|
||||
bool got_uv = false, got_normal = false;
|
||||
|
@ -399,6 +400,7 @@ void OBJParser::parse(Vector<std::unique_ptr<Geometry>> &r_all_geometries,
|
|||
StringRef buffer_str{buffer.data(), (int64_t)last_nl};
|
||||
while (!buffer_str.is_empty()) {
|
||||
StringRef line = read_next_line(buffer_str);
|
||||
line = drop_whitespace(line);
|
||||
++line_number;
|
||||
if (line.is_empty()) {
|
||||
continue;
|
||||
|
@ -484,9 +486,6 @@ void OBJParser::parse(Vector<std::unique_ptr<Geometry>> &r_all_geometries,
|
|||
else if (line.startswith("end")) {
|
||||
/* End of curve definition, nothing else to do. */
|
||||
}
|
||||
else if (line.front() <= ' ') {
|
||||
/* Just whitespace, skip. */
|
||||
}
|
||||
else {
|
||||
std::cout << "OBJ element not recognized: '" << line << "'" << std::endl;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue