amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

ENABLE_RELOAD_FROM_DISK_REPLACE_FILE - Search missing files in the same folder of the current project

Browse source
This commit is contained in:
enricoturri1966 2021-09-10 10:22:44 +02:00
parent 638fc5a869
commit 37c9e20778
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/slic3r/GUI/Plater.cpp
View file

@ -3417,8 +3417,28 @@ void Plater::priv::reload_from_disk()
if (!volume->source.input_file.empty()) { if (!volume->source.input_file.empty()) {
if (fs::exists(volume->source.input_file)) if (fs::exists(volume->source.input_file))
input_paths.push_back(volume->source.input_file); input_paths.push_back(volume->source.input_file);
#if ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
else {
// searches the source in the same folder containing the object
bool found = false;
if (!object->input_file.empty()) {
fs::path object_path = fs::path(object->input_file).remove_filename();
if (!object_path.empty()) {
object_path /= fs::path(volume->source.input_file).filename();
const std::string source_input_file = object_path.string();
if (fs::exists(source_input_file)) {
input_paths.push_back(source_input_file);
found = true;
}
}
}
if (!found)
missing_input_paths.push_back(volume->source.input_file);
}
#else
else else
missing_input_paths.push_back(volume->source.input_file); missing_input_paths.push_back(volume->source.input_file);
#endif // ENABLE_RELOAD_FROM_DISK_REPLACE_FILE
} }
else if (!object->input_file.empty() && volume->is_model_part() && !volume->name.empty() && !volume->source.is_from_builtin_objects) else if (!object->input_file.empty() && volume->is_model_part() && !volume->name.empty() && !volume->source.is_from_builtin_objects)
missing_input_paths.push_back(volume->name); missing_input_paths.push_back(volume->name);