Page MenuHome
Differential D14822 Diff 51070 source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc

Changeset View

Standalone View

View Options

source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc

Context not available.
fprintf(stderr, "Cannot read from OBJ file:'%s'.\n", import_params_.filepath); fprintf(stderr, "Cannot read from OBJ file:'%s'.\n", import_params_.filepath);
return; return;
} }
/* Always add any existing .mtl file that's with the same base name as the .obj file
deadpinUnsubmitted
Not Done
Inline Actions

Yeah, it's unfortunate. I found 3 other files last night that depended on that same quirk of the old importer (confirmed fixed with this patch now). However, given that the spec says that material libs should be searched in order, should this be appended after the regular parsing so this truly becomes just a last-resort fallback?

deadpin: Yeah, it's unfortunate. I found 3 other files last night that depended on that same quirk of…
* into candidate .mtl files to search through. This is not technically following the
* spec, but the old python importer was doing it, and there are user files out there
* that contain "mtllib bar.mtl" for a foo.obj, and depend on finding materials
* from foo.mtl. */
char mtl_file_path[FILE_MAX];
BLI_strncpy(mtl_file_path, import_params_.filepath, sizeof(mtl_file_path));
BLI_path_extension_replace(mtl_file_path, sizeof(mtl_file_path), ".mtl");
if (BLI_exists(mtl_file_path)) {
char mtl_file_base[FILE_MAX];
BLI_split_file_part(mtl_file_path, mtl_file_base, sizeof(mtl_file_base));
mtl_libraries_.append(mtl_file_base);
}
} }
OBJParser::~OBJParser() OBJParser::~OBJParser()
Context not available.
} }
} }
else if (parse_keyword(line, "mtllib")) { else if (parse_keyword(line, "mtllib")) {
mtl_libraries_.append(line.trim()); std::string lib_name = line.trim();
if (!mtl_libraries_.contains(lib_name)) {
mtl_libraries_.append(lib_name);
}
} }
/* Comments. */ /* Comments. */
else if (line.startswith("#")) { else if (line.startswith("#")) {
Context not available.
if (parse_keyword(line, "newmtl")) { if (parse_keyword(line, "newmtl")) {
line = line.trim(); line = line.trim();
if (r_materials.remove_as(line)) { r_materials.remove_as(line);
std::cerr << "Duplicate material found:'" << line
<< "', using the last encountered Material definition." << std::endl;
}
material = r_materials.lookup_or_add(string(line), std::make_unique<MTLMaterial>()).get(); material = r_materials.lookup_or_add(string(line), std::make_unique<MTLMaterial>()).get();
} }
else if (material != nullptr) { else if (material != nullptr) {
Context not available.