From 461275d9bbdaea35104737ea39aedaff6ea05038 Mon Sep 17 00:00:00 2001 From: Kris Austin Date: Sun, 11 Oct 2026 15:41:47 -0500 Subject: [PATCH 1/3] ci: build pushes that change deps_src or the build scripts (#16378) --- .github/workflows/build_all.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index b849979de0..081cfd22cc 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -7,6 +7,7 @@ on: - release/* paths: - 'deps/**' + - 'deps_src/**' - 'src/**' - '**/CMakeLists.txt' - 'version.inc' @@ -14,8 +15,10 @@ on: - 'resources/**' - ".github/workflows/build_*.yml" - ".github/workflows/unit_tests*.yml" + - 'build_linux.sh' - 'build_win.bat' - 'scripts/test_build_win.ps1' + - 'build_release_macos.sh' - 'scripts/build_preset_cache.*' - 'scripts/flatpak/**' - 'scripts/msix/**' From d5a11eb076daa0e83809c68dd21fb32879eba5a2 Mon Sep 17 00:00:00 2001 From: Kris Austin Date: Sun, 11 Oct 2026 16:32:32 -0500 Subject: [PATCH 2/3] ci: cancel Build all runs of closed pull requests (#16380) --- .github/workflows/build_all.yml | 4 +++- .github/workflows/cancel_closed_pr_builds.yml | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/cancel_closed_pr_builds.yml diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 081cfd22cc..22790fb1e8 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -57,7 +57,9 @@ on: default: false concurrency: - group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref }} + # cancel_closed_pr_builds.yml joins this group by name, so update that file + # with any change here. + group: build-all-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref }} # Pushes don't cancel a running build, because only a finished branch build # saves caches every pull request can restore. cancel-in-progress: ${{ github.event_name == 'pull_request' }} diff --git a/.github/workflows/cancel_closed_pr_builds.yml b/.github/workflows/cancel_closed_pr_builds.yml new file mode 100644 index 0000000000..c0c9c52fee --- /dev/null +++ b/.github/workflows/cancel_closed_pr_builds.yml @@ -0,0 +1,21 @@ +name: Cancel builds of closed pull requests + +on: + # pull_request_target needs no approval for first-time contributors and must never + # check out pull request code. + pull_request_target: + types: + - closed + +permissions: {} + +jobs: + cancel: + # Matches the concurrency group in build_all.yml, so joining it cancels the pull + # request's unfinished Build all run. + concurrency: + group: build-all-pull_request-${{ github.event.pull_request.number }} + cancel-in-progress: true + runs-on: ubuntu-latest + steps: + - run: echo "Joined concurrency group build-all-pull_request-${{ github.event.pull_request.number }}." From f4bde2da0a41d4deb1f312b3c2bd11e85270b6b2 Mon Sep 17 00:00:00 2001 From: Kiss Lorand <50251547+kisslorand@users.noreply.github.com> Date: Mon, 12 Oct 2026 02:54:55 +0300 Subject: [PATCH 3/3] Fix missing plate bed override normalization in Configuration Wizard (#16365) --- src/slic3r/GUI/ConfigWizard.cpp | 3 +++ src/slic3r/GUI/ParamsDialog.cpp | 7 +------ src/slic3r/GUI/Plater.cpp | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index 347973c667..5d14f8162e 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -81,6 +81,7 @@ #include "MsgDialog.hpp" #include "UnsavedChangesDialog.hpp" #include "MainFrame.hpp" +#include "Plater.hpp" namespace fs = boost::filesystem; @@ -2813,6 +2814,8 @@ bool ConfigWizard::run(RunReason reason, StartPage start_page) app.app_config->set_legacy_datadir(false); app.update_mode(); + if (Plater *plater = app.plater()) + plater->normalize_bed_types(false); // BBS //app.obj_manipul()->update_ui_from_settings(); BOOST_LOG_TRIVIAL(info) << "ConfigWizard applied"; diff --git a/src/slic3r/GUI/ParamsDialog.cpp b/src/slic3r/GUI/ParamsDialog.cpp index c7bca55f16..3fa40ec931 100644 --- a/src/slic3r/GUI/ParamsDialog.cpp +++ b/src/slic3r/GUI/ParamsDialog.cpp @@ -77,11 +77,8 @@ ParamsDialog::ParamsDialog(wxWindow * parent) auto &preset_bundle = *wxGetApp().preset_bundle; const bool supports_multiple_bed_types = preset_bundle.is_bbl_vendor() || preset_bundle.printers.get_edited_preset().config.opt_bool("support_multi_bed_types"); - if (m_initial_multi_bed_types != supports_multiple_bed_types) { + if (m_initial_multi_bed_types != supports_multiple_bed_types) wxGetApp().plater()->normalize_bed_types(true); - if (auto *plate_tab = dynamic_cast(wxGetApp().get_plate_tab())) - plate_tab->update_model_config(); - } } if (!m_editing_filament_id.empty()) { @@ -93,8 +90,6 @@ ParamsDialog::ParamsDialog(wxWindow * parent) #endif wxGetApp().sidebar().finish_param_edit(); }); - - //wxGetApp().UpdateDlgDarkUI(this); } void ParamsDialog::Popup() diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 7004ebaa34..8339e4d9d9 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -15609,7 +15609,7 @@ void Plater::reset_project_dirty_initial_presets() { p->reset_project_dirty_init void Plater::render_project_state_debug_window() const { p->render_project_state_debug_window(); } #endif // ENABLE_PROJECT_DIRTY_STATE_DEBUG_WINDOW -void Plater::normalize_bed_types(bool printer_setting_changed) +void Plater::normalize_bed_types(bool multi_bed_changed) { if (only_gcode_mode() || is_gcode_3mf()) return; @@ -15635,7 +15635,7 @@ void Plater::normalize_bed_types(bool printer_setting_changed) } // Refresh the controls after a capability change, even when no override was reset. - if (printer_setting_changed || overrides_reset) { + if (multi_bed_changed || overrides_reset) { sidebar().update_all_preset_comboboxes(); wxGetApp().obj_list()->update_and_show_object_settings_item(); }