3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'tm_fix_sla_arch_profile_import_SPE-1688'

Browse source
This commit is contained in:
tamasmeszaros 2023-05-12 08:34:01 +02:00
commit d431204c51
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/Format/SL1.cpp
View file

@ -438,7 +438,7 @@ ConfigSubstitutions SL1Reader::read(std::vector<ExPolygons> &slices,
ConfigSubstitutions SL1Reader::read(DynamicPrintConfig &out)
{
ZipperArchive arch = read_zipper_archive(m_fname, {}, {"png"});
ZipperArchive arch = read_zipper_archive(m_fname, {"ini"}, {"png", "thumbnail"});
return out.load(arch.profile, ForwardCompatibilitySubstitutionRule::Enable);
}

11
src/libslic3r/Format/ZipperArchiveImport.cpp
View file

@ -83,8 +83,15 @@ ZipperArchive read_zipper_archive(const std::string &zipfname,
}))
continue;
if (name == CONFIG_FNAME) { arch.config = read_ini(entry, zip); continue; }
if (name == PROFILE_FNAME) { arch.profile = read_ini(entry, zip); continue; }
if (name == CONFIG_FNAME) {
arch.config = read_ini(entry, zip);
continue;
}
if (name == PROFILE_FNAME) {
arch.profile = read_ini(entry, zip);
continue;
}
auto it = std::lower_bound(
arch.entries.begin(), arch.entries.end(),