From b1420283b6a548b3a64a7d4129e37651f655562f Mon Sep 17 00:00:00 2001
From: bubnikv <bubnikv@gmail.com>
Date: Thu, 4 Jul 2019 20:49:46 +0200
Subject: [PATCH] Fixed merge issues.

---
 src/libslic3r/Format/3mf.cpp      | 2 +-
 src/libslic3r/Format/AMF.cpp      | 6 ++----
 src/libslic3r/Model.cpp           | 4 ++--
 src/libslic3r/Model.hpp           | 2 +-
 src/libslic3r/Print.cpp           | 8 ++++----
 src/slic3r/GUI/GUI_ObjectList.cpp | 8 ++++++++
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/libslic3r/Format/3mf.cpp b/src/libslic3r/Format/3mf.cpp
index e9f068974..21c680d2d 100644
--- a/src/libslic3r/Format/3mf.cpp
+++ b/src/libslic3r/Format/3mf.cpp
@@ -2134,7 +2134,7 @@ namespace Slic3r {
                     const DynamicPrintConfig& config = range.second;
                     for (const std::string& opt_key : config.keys())
                     {
-                        pt::ptree& opt_tree = range_tree.add("option", config.serialize(opt_key));
+                        pt::ptree& opt_tree = range_tree.add("option", config.opt_serialize(opt_key));
                         opt_tree.put("<xmlattr>.opt_key", opt_key);
                     }
                 }
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++;
diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp
index 0c29aa721..949f82c0a 100644
--- a/src/libslic3r/Model.cpp
+++ b/src/libslic3r/Model.cpp
@@ -1579,9 +1579,9 @@ void ModelVolume::center_geometry_after_creation()
     if (!shift.isApprox(Vec3d::Zero()))
     {
     	if (m_mesh)
-        	m_mesh->translate(-(float)shift(0), -(float)shift(1), -(float)shift(2));
+        	const_cast<TriangleMesh*>(m_mesh.get())->translate(-(float)shift(0), -(float)shift(1), -(float)shift(2));
         if (m_convex_hull)
-        	m_convex_hull->translate(-(float)shift(0), -(float)shift(1), -(float)shift(2));
+			const_cast<TriangleMesh*>(m_convex_hull.get())->translate(-(float)shift(0), -(float)shift(1), -(float)shift(2));
         translate(shift);
     }
 }
diff --git a/src/libslic3r/Model.hpp b/src/libslic3r/Model.hpp
index 0a50315ce..f8ebe3134 100644
--- a/src/libslic3r/Model.hpp
+++ b/src/libslic3r/Model.hpp
@@ -342,7 +342,7 @@ private:
 	}
 	template<class Archive> void serialize(Archive &ar) {
 		ar(cereal::base_class<ObjectBase>(this));
-		ar(name, input_file, instances, volumes, config, layer_height_ranges, layer_height_profile, sla_support_points, sla_points_status, origin_translation,
+		ar(name, input_file, instances, volumes, config, layer_config_ranges, layer_height_profile, sla_support_points, sla_points_status, origin_translation,
 			m_bounding_box, m_bounding_box_valid, m_raw_bounding_box, m_raw_bounding_box_valid, m_raw_mesh_bounding_box, m_raw_mesh_bounding_box_valid);
 	}
 };
diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
index 122034c53..f34a66760 100644
--- a/src/libslic3r/Print.cpp
+++ b/src/libslic3r/Print.cpp
@@ -587,10 +587,10 @@ Print::ApplyStatus Print::apply(const Model &model, const DynamicPrintConfig &co
             Moved,
             Deleted,
         };
-        ModelObjectStatus(ModelID id, Status status = Unknown) : id(id), status(status) {}
-        ModelID     id;
-        Status      status;
-        LayerRanges layer_ranges;
+        ModelObjectStatus(ObjectID id, Status status = Unknown) : id(id), status(status) {}
+		ObjectID     id;
+        Status       status;
+        LayerRanges  layer_ranges;
         // Search by id.
         bool operator<(const ModelObjectStatus &rhs) const { return id < rhs.id; }
     };
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index d47c84c37..4ef1cb0d2 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -3400,5 +3400,13 @@ void ObjectList::recreate_object_list()
     m_prevent_list_events = false;
 }
 
+ModelObject* ObjectList::object(const int obj_idx) const
+{
+    if (obj_idx < 0)
+        return nullptr;
+
+    return (*m_objects)[obj_idx];
+}
+
 } //namespace GUI
 } //namespace Slic3r 
\ No newline at end of file