diff options
author | bubnikv <bubnikv@gmail.com> | 2019-07-04 21:49:46 +0300 |
---|---|---|
committer | bubnikv <bubnikv@gmail.com> | 2019-07-04 21:49:46 +0300 |
commit | b1420283b6a548b3a64a7d4129e37651f655562f (patch) | |
tree | 7253292be710448f70449294f6d0792290aa8348 /src/libslic3r/Format/AMF.cpp | |
parent | 3a24fb2f4725d79b181fcf5d80646711be5c888c (diff) |
Fixed merge issues.
Diffstat (limited to 'src/libslic3r/Format/AMF.cpp')
-rw-r--r-- | src/libslic3r/Format/AMF.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libslic3r/Format/AMF.cpp b/src/libslic3r/Format/AMF.cpp index 074b7e933..e964d3b9d 100644 --- a/src/libslic3r/Format/AMF.cpp +++ b/src/libslic3r/Format/AMF.cpp @@ -933,10 +933,8 @@ bool store_amf(const char *path, Model *model, const DynamicPrintConfig *config) stream << ";" << layer_height_profile[i]; stream << "\n </metadata>\n"; } - //FIXME Store the layer height ranges (ModelObject::layer_height_ranges) - - // #ys_FIXME_experiment : Try to export layer config range + // Export layer height ranges including the layer range specific config overrides. const t_layer_config_ranges& config_ranges = object->layer_config_ranges; if (!config_ranges.empty()) { @@ -950,7 +948,7 @@ bool store_amf(const char *path, Model *model, const DynamicPrintConfig *config) stream << range.first.first << ";" << range.first.second << "</metadata>\n"; for (const std::string& key : range.second.keys()) - stream << " <metadata type=\"slic3r." << key << "\">" << range.second.serialize(key) << "</metadata>\n"; + stream << " <metadata type=\"slic3r." << key << "\">" << range.second.opt_serialize(key) << "</metadata>\n"; stream << " </range>\n"; layer_counter++; |