Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_sinking_contours

src/libslic3r/AppConfig.cpp

@@ -542,7 +542,7 @@ void AppConfig::update_config_dir(const std::string &dir)
 
 void AppConfig::update_skein_dir(const std::string &dir)
 {
-    if (dir == sys_shapes_dir() || dir == custom_shapes_dir())
+    if (is_shapes_dir(dir))
         return; // do not save "shapes gallery" directory
     this->set("recent", "skein_directory", dir);
 }
@@ -576,7 +576,7 @@ std::string AppConfig::get_last_output_dir(const std::string& alt, const bool re
 		if (it2 != it->second.end() && it3 != it->second.end() && !it2->second.empty() && it3->second == "1")
 			return it2->second;
 	}
-	return alt;
+	return is_shapes_dir(alt) ? get_last_dir() : alt;
 }
 
 void AppConfig::update_last_output_dir(const std::string& dir, const bool removable)

src/libslic3r/CMakeLists.txt

@@ -1,5 +1,5 @@
-project(libslic3r)
 cmake_minimum_required(VERSION 3.13)
+project(libslic3r)
 
 include(PrecompiledHeader)
 

src/libslic3r/SLA/Hollowing.cpp

@@ -112,7 +112,7 @@ InteriorPtr generate_interior(const TriangleMesh &   mesh,
                               const HollowingConfig &hc,
                               const JobController &  ctl)
 {
-    static const double MIN_OVERSAMPL = 3.;
+    static const double MIN_OVERSAMPL = 3.5;
     static const double MAX_OVERSAMPL = 8.;
 
     // I can't figure out how to increase the grid resolution through openvdb

src/libslic3r/SLAPrint.hpp

@@ -323,6 +323,7 @@ private:
         {
             support_tree_ptr = sla::SupportTree::create(*this, ctl);
             tree_mesh = TriangleMesh{support_tree_ptr->retrieve_mesh(sla::MeshType::Support)};
+            tree_mesh.require_shared_vertices();
             return support_tree_ptr;
         }
 

src/libslic3r/TryCatchSignal.hpp

@@ -10,9 +10,9 @@
 using SignalT = decltype (SIGSEGV);
 
 template<class TryFn, class CatchFn, int N>
-void try_catch_signal(const SignalT (&/*sigs*/)[N], TryFn &&/*fn*/, CatchFn &&/*cfn*/)
+void try_catch_signal(const SignalT (&/*sigs*/)[N], TryFn &&fn, CatchFn &&/*cfn*/)
 {
-    // TODO
+    fn();
 }
 #endif
 

src/libslic3r/Utils.hpp

@@ -102,6 +102,7 @@ extern bool is_gcode_file(const std::string &path);
 extern bool is_img_file(const std::string& path);
 extern bool is_stl_file(const boost::filesystem::directory_entry& path);
 extern bool is_stl_file(const std::string& path);
+extern bool is_shapes_dir(const std::string& dir);
 
 // File path / name / extension splitting utilities, working with UTF-8,
 // to be published to Perl.

src/libslic3r/utils.cpp

@@ -776,6 +776,11 @@ bool is_stl_file(const std::string &path)
 	return boost::iends_with(path, ".stl");
 }
 
+bool is_shapes_dir(const std::string& dir)
+{
+	return dir == sys_shapes_dir() || dir == custom_shapes_dir();
+}
+
 } // namespace Slic3r
 
 #ifdef WIN32