GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-01 03:11:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/prusa/stable' into merill-merge

Browse Source
This commit is contained in:
supermerill 2021-08-21 03:22:29 +02:00
commit b567fd445b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/Config.hpp
View File

@ -1479,7 +1479,7 @@ public:
unsigned char new_value = 0; unsigned char new_value = 0;
if (item_str == "nil") { if (item_str == "nil") {
if (NULLABLE) if (NULLABLE)
this->values.push_back(nil_value()); new_value = nil_value();
else else
throw ConfigurationError("Deserializing nil into a non-nullable object"); throw ConfigurationError("Deserializing nil into a non-nullable object");
} else if (item_str == "1") { } else if (item_str == "1") {

1
src/libslic3r/Optimize/Optimizer.hpp
View File

@ -8,6 +8,7 @@
#include <functional> #include <functional>
#include <limits> #include <limits>
#include <cassert> #include <cassert>
#include <optional>
namespace Slic3r { namespace opt { namespace Slic3r { namespace opt {