Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAras Pranckevicius <aras@nesnausk.org>2022-04-04 14:58:45 +0300
committerAras Pranckevicius <aras@nesnausk.org>2022-04-04 14:58:45 +0300
commita56f53ad5615afc4b9ed74907de21376c14b3775 (patch)
tree98487d67b708c00a7fb2b086cdba9fbfdfd173f9 /source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc
parent277fa2f441f4ab2c00e7f329ba34a3466956647c (diff)
OBJ: fix mac/linux tests and compile warnings in the new obj importer
Related to D13958
Diffstat (limited to 'source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc')
-rw-r--r--source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc b/source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc
index 9111ff05e8a..7dac8525bf5 100644
--- a/source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc
+++ b/source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc
@@ -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;
}
}