diff options
| author | supermerill <merill@free.fr> | 2021-08-21 04:22:29 +0300 |
|---|---|---|
| committer | supermerill <merill@free.fr> | 2021-08-21 04:22:29 +0300 |
| commit | b567fd445ba900fa341c7fdb79e0b01eb56979b9 (patch) | |
| tree | cf0960436dd2eb6b56936af2c56179d45481b43a | |
| parent | 4db23d79da130606b63383bee1647713d329a10f (diff) | |
| parent | 8f0916e37135a47a6d23fe3ed9815b96f175df05 (diff) | |
Merge remote-tracking branch 'remotes/prusa/stable' into merill-merge
| -rw-r--r-- | src/libslic3r/Config.hpp | 2 | ||||
| -rw-r--r-- | src/libslic3r/Optimize/Optimizer.hpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/libslic3r/Config.hpp b/src/libslic3r/Config.hpp index 5a6c54f14..736b24400 100644 --- a/src/libslic3r/Config.hpp +++ b/src/libslic3r/Config.hpp @@ -1479,7 +1479,7 @@ public: unsigned char new_value = 0; if (item_str == "nil") { if (NULLABLE) - this->values.push_back(nil_value()); + new_value = nil_value(); else throw ConfigurationError("Deserializing nil into a non-nullable object"); } else if (item_str == "1") { diff --git a/src/libslic3r/Optimize/Optimizer.hpp b/src/libslic3r/Optimize/Optimizer.hpp index 05191eba2..8ae55c61c 100644 --- a/src/libslic3r/Optimize/Optimizer.hpp +++ b/src/libslic3r/Optimize/Optimizer.hpp @@ -8,6 +8,7 @@ #include <functional> #include <limits> #include <cassert> +#include <optional> namespace Slic3r { namespace opt { |