From 16e41ab819a3938c3f1b814275afc654f63add1a Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Wed, 14 Jul 2021 10:13:52 +0200 Subject: [PATCH 1/3] Fix of 2.3.2 regression in configuration layer (reading of nullable boolean vectors) Fix of Filament overrides on saved 3MF MMU profiles are broken #6711 --- src/libslic3r/Config.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libslic3r/Config.hpp b/src/libslic3r/Config.hpp index 98596577a..57182428f 100644 --- a/src/libslic3r/Config.hpp +++ b/src/libslic3r/Config.hpp @@ -1363,7 +1363,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") { From 6a1c75e5eef8ab44b4aa23d9381e287ade9b4cab Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Thu, 15 Jul 2021 10:18:03 +0200 Subject: [PATCH 2/3] Fix build with gcc11 --- src/libslic3r/Optimize/Optimizer.hpp | 1 + 1 file changed, 1 insertion(+) 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 #include #include +#include namespace Slic3r { namespace opt { From 8f0916e37135a47a6d23fe3ed9815b96f175df05 Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Fri, 16 Jul 2021 12:14:03 +0200 Subject: [PATCH 3/3] Bumped up version number --- version.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/version.inc b/version.inc index 632712806..7c9ee65db 100644 --- a/version.inc +++ b/version.inc @@ -3,7 +3,7 @@ set(SLIC3R_APP_NAME "PrusaSlicer") set(SLIC3R_APP_KEY "PrusaSlicer") -set(SLIC3R_VERSION "2.3.2") +set(SLIC3R_VERSION "2.3.3") set(SLIC3R_BUILD_ID "PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN") -set(SLIC3R_RC_VERSION "2,3,2,0") -set(SLIC3R_RC_VERSION_DOTS "2.3.2.0") +set(SLIC3R_RC_VERSION "2,3,3,0") +set(SLIC3R_RC_VERSION_DOTS "2.3.3.0")