juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-22 18:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into dev/h2d-2

Browse Source 
# Conflicts:
#	src/slic3r/GUI/Tab.cpp
This commit is contained in:
Noisyfox
2025-09-24 09:15:33 +08:00
parent f60020da21 c59255a605
commit 580414265d
261 changed files with 9126 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/Plater.cpp
View File

@@ -5399,7 +5399,7 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
// }
// }
// Orca: check if the project is created with OrcaSlicer 2.3.1-alpha and use the sparse infill rotation template for non-safe infill patterns
else if ((file_version < app_version) && file_version == Semver("2.3.1-alpha")) {
else if (load_config && (file_version < app_version) && file_version == Semver("2.3.1-alpha")) {
if (!config_loaded.opt_string("sparse_infill_rotate_template").empty()) {
const auto _sparse_infill_pattern =
config_loaded.option<ConfigOptionEnum<InfillPattern>>("sparse_infill_pattern")->value;