Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp

xs/src/libslic3r/PerimeterGenerator.hpp

@@ -24,9 +24,8 @@ public:
     // Children contour, may be both CCW and CW oriented (outer contours or holes).
     std::vector<PerimeterGeneratorLoop> children;
     
-    PerimeterGeneratorLoop(Polygon polygon, unsigned short depth)
-        : polygon(polygon), is_contour(false), depth(depth)
-        {};
+    PerimeterGeneratorLoop(Polygon polygon, unsigned short depth, bool is_contour) : 
+        polygon(polygon), is_contour(is_contour), depth(depth) {}
     // External perimeter. It may be CCW or CW oriented (outer contour or hole contour).
     bool is_external() const { return this->depth == 0; }
     // An island, which may have holes, but it does not have another internal island.

xs/src/libslic3r/PrintObject.cpp

@@ -1459,7 +1459,6 @@ void PrintObject::_make_perimeters()
         size_t region_id = region_it - this->_print->regions.begin();
         const PrintRegion &region = **region_it;
         
-        
         if (!region.config.extra_perimeters
             || region.config.perimeters == 0
             || region.config.fill_density == 0

xs/src/slic3r/GUI/AppConfig.hpp

@@ -101,7 +101,7 @@ public:
 
 	// Returns true if the user's data directory comes from before Slic3r 1.40.0 (no updating)
 	bool legacy_datadir() const { return m_legacy_datadir; }
-	bool set_legacy_datadir(bool value) { m_legacy_datadir = value; }
+	void set_legacy_datadir(bool value) { m_legacy_datadir = value; }
 
 	// Get the Slic3r version check url.
 	// This returns a hardcoded string unless it is overriden by "version_check_url" in the ini file.