From b0fe0859f7c5145a70ca3408e044fe4295489724 Mon Sep 17 00:00:00 2001 From: alves Date: Thu, 5 Mar 2026 16:24:14 +0800 Subject: [PATCH 1/3] fix linux build failed with the wxwidget dark theme patch --- scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml b/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml index 28a2bda246..d024787914 100644 --- a/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml +++ b/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml @@ -104,12 +104,6 @@ modules: url: https://github.com/SoftFever/Orca-deps-wxWidgets branch: master path: ../ - - type: file - path: patches/0001-Enable-using-a-dark-theme-when-Gnome-dark-style-is-s.patch - dest-filename: wxwidgets-dark-theme.patch - - type: shell - commands: - - patch -p1 < wxwidgets-dark-theme.patch cleanup: - "*.la" - "*.a" From 263ca4b76b7963ff33d253a5a75e25109fda123d Mon Sep 17 00:00:00 2001 From: alves Date: Thu, 5 Mar 2026 16:45:00 +0800 Subject: [PATCH 2/3] fix crash question when the obj is null --- src/slic3r/GUI/ObjectDataViewModel.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/slic3r/GUI/ObjectDataViewModel.cpp b/src/slic3r/GUI/ObjectDataViewModel.cpp index 80a92a703a..da770bc1a0 100644 --- a/src/slic3r/GUI/ObjectDataViewModel.cpp +++ b/src/slic3r/GUI/ObjectDataViewModel.cpp @@ -554,6 +554,9 @@ void ObjectDataViewModel::UpdateBitmapForNode(ObjectDataViewModelNode *node) scaled_bitmap_name += std::to_string(vol_type); scaled_bitmap_name += (wxGetApp().dark_mode() ? "-dm" : "-lm"); + if (!m_bitmap_cache) + return; + wxBitmap* bmp = m_bitmap_cache->find(scaled_bitmap_name); if (bmp == nullptr) { std::vector bmps; From fd113a3d338dfd392ed6f49cc00f2eb168a0440b Mon Sep 17 00:00:00 2001 From: alves Date: Thu, 5 Mar 2026 16:45:42 +0800 Subject: [PATCH 3/3] fix build linux failed bug. --- .../flatpak/io.github.Snapmaker.Snapmaker_Orca.metainfo.xml | 4 ++-- scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.metainfo.xml b/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.metainfo.xml index 89142a3518..2c6cda2ee4 100644 --- a/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.metainfo.xml +++ b/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.metainfo.xml @@ -38,9 +38,9 @@ #009688 - + -

Version 2.2.1 release with improvements and bug fixes.

+

Version 2.2.4 release with improvements and bug fixes.

diff --git a/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml b/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml index 28a2bda246..d024787914 100644 --- a/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml +++ b/scripts/flatpak/io.github.Snapmaker.Snapmaker_Orca.yml @@ -104,12 +104,6 @@ modules: url: https://github.com/SoftFever/Orca-deps-wxWidgets branch: master path: ../ - - type: file - path: patches/0001-Enable-using-a-dark-theme-when-Gnome-dark-style-is-s.patch - dest-filename: wxwidgets-dark-theme.patch - - type: shell - commands: - - patch -p1 < wxwidgets-dark-theme.patch cleanup: - "*.la" - "*.a"