Benjamin Greiner
2ca808d67e
* This release introduces multiple beds, scarf seams, Printables integration,
improved support for multiple nozzle diameters, paint-on fuzzy skin and
many more improvements and bugfixes.
* See https://github.com/prusa3d/PrusaSlicer/releases/tag/version_2.9.0
- Added PrusaSlicer-2.9.0-pr13896-static-libs.patch
gh#prusa3d/PrusaSlicer#13896
- Added PrusaSlicer-2.9.0-pr13885-printconfig-segfault.patch
gh#prusa3d/PrusaSlicer#13885
- Removed PrusaSlicer-2.8.1-pr13609-fix-build.patch
OBS-URL: https://build.opensuse.org/package/show/science/PrusaSlicer?expand=0&rev=91
51 lines
3.0 KiB
Diff
51 lines
3.0 KiB
Diff
From f67a877d583eba5472003f0ea4df3f7420d70734 Mon Sep 17 00:00:00 2001
|
|
From: Gregor Riepl <onitake@gmail.com>
|
|
Date: Mon, 27 Nov 2023 13:01:55 +0100
|
|
Subject: [PATCH] Make initializers explicit to avoid ambiguous wxArrayString
|
|
overloads
|
|
|
|
---
|
|
src/slic3r/GUI/PhysicalPrinterDialog.cpp | 2 +-
|
|
src/slic3r/GUI/Plater.cpp | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
Index: PrusaSlicer-version_2.9.0/src/slic3r/GUI/PhysicalPrinterDialog.cpp
|
|
===================================================================
|
|
--- PrusaSlicer-version_2.9.0.orig/src/slic3r/GUI/PhysicalPrinterDialog.cpp 2024-12-20 12:54:34.000000000 +0100
|
|
+++ PrusaSlicer-version_2.9.0/src/slic3r/GUI/PhysicalPrinterDialog.cpp 2024-12-20 15:32:12.247773628 +0100
|
|
@@ -607,7 +607,7 @@ void PhysicalPrinterDialog::build_printh
|
|
// Always fill in the "printhost_port" combo box from the config and select it.
|
|
{
|
|
Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
|
|
- choice->set_values({ m_config->opt_string("printhost_port") });
|
|
+ choice->set_values(std::vector<std::string>({ m_config->opt_string("printhost_port") }));
|
|
choice->set_selection();
|
|
}
|
|
|
|
Index: PrusaSlicer-version_2.9.0/src/slic3r/GUI/Plater.cpp
|
|
===================================================================
|
|
--- PrusaSlicer-version_2.9.0.orig/src/slic3r/GUI/Plater.cpp 2024-12-20 12:54:34.000000000 +0100
|
|
+++ PrusaSlicer-version_2.9.0/src/slic3r/GUI/Plater.cpp 2024-12-20 15:32:12.251106999 +0100
|
|
@@ -4420,7 +4420,7 @@ void Plater::load_project(const wxString
|
|
s_multiple_beds.set_loading_project_flag(true);
|
|
ScopeGuard guard([](){ s_multiple_beds.set_loading_project_flag(false);});
|
|
|
|
- if (! load_files({ into_path(filename) }).empty()) {
|
|
+ if (! load_files(std::vector<boost::filesystem::path>({ into_path(filename) })).empty()) {
|
|
// At least one file was loaded.
|
|
p->set_project_filename(filename);
|
|
// Save the names of active presets and project specific config into ProjectDirtyStateManager.
|
|
Index: PrusaSlicer-version_2.9.0/src/slic3r/Utils/PrusaConnect.cpp
|
|
===================================================================
|
|
--- PrusaSlicer-version_2.9.0.orig/src/slic3r/Utils/PrusaConnect.cpp 2024-12-20 12:54:34.000000000 +0100
|
|
+++ PrusaSlicer-version_2.9.0/src/slic3r/Utils/PrusaConnect.cpp 2024-12-20 15:32:12.251106999 +0100
|
|
@@ -256,7 +256,7 @@ bool PrusaConnectNew::get_storage(wxArra
|
|
if (path && (!available || *available)) {
|
|
StorageInfo si;
|
|
si.path = boost::nowide::widen(*path);
|
|
- si.name = name ? boost::nowide::widen(*name) : wxString();
|
|
+ si.name = name ? boost::nowide::widen(*name) : std::wstring();
|
|
// If read_only is missing, assume it is NOT read only.
|
|
// si.read_only = read_only ? *read_only : false; // version without "ro"
|
|
si.read_only = (read_only ? *read_only : (ro ? *ro : false));
|