Repository navigation
Log BambuStudio 3MF substitutions instead of popping dialogs - #404
Merged
Merged
Conversation
Port Orca OrcaSlicer#16060/OrcaSlicer#16059: reject AMF metadata without a type, and bound BBS 3MF component expansion so cyclic or huge graphs fail cleanly. Paint-depth 3MF data is untouched. Co-authored-by: aceRage <[email protected]>
Port Orca OrcaSlicer#16153 the Edge way: gate on the BambuStudio generator stamp, not From_BBS. Edge stamps its own and Snapmaker Orca 3MFs as From_BBS, so those still show the substitution dialog. Co-authored-by: aceRage <[email protected]>
…or/orca-16153-bambu-project-dialogs-7650 Deft
…Orca 16153 does Orca only tagged its own 3MFs after 2.3.2, so an older BambuStudio-stamped file may be an Orca project and keeps the substitution dialog. Deft
… the test), add the 100000 component budget boundary test Deft
…or/orca-16153-bambu-project-dialogs-7650 Deft
This was referenced Oct 12, 2026
aceRage
marked this pull request as ready for review
October 12, 2026 12:45
aceRage
added a commit
that referenced
this pull request
Oct 12, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Port Orca OrcaSlicer#16153 the Edge way: genuine BambuStudio projects log setting substitutions instead of popping
show_substitutions_info. Gated on the BambuStudio generator stamp, notFrom_BBS && file_version > 2.3.2.Upstream: merged
9a9285a8, Oct 8 10:33 PM CT — OrcaSlicer#16153Edge baseline:
809c69ef6e8d4a791d42f4913c25af3ab9ddfd35(re-checkedorigin/mainbefore branching).Why not upstream's condition (D-13a, required)
Edge's
_handle_end_metadatasetsm_is_bbl_3mf(→En3mfType::From_BBS) forBambuStudio-*, andSLIC3R_APP_NAME-*(Edge's own files), andSnapmaker_Orca-*. Edge's version is 2.4.5.x > 2.3.2, soFrom_BBS && file_version > 2.3.2would also silence substitution dialogs for Edge's and Snapmaker Orca's own projects.Did not add an
En3mfTypevalue (== From_BBSchecks at L12256 log / L12524 translate_old would silently change).Ported
_BBS_3MF_Importer::m_is_bambu_studio_generator, set only in theBambuStudio-branch.bool *is_bambu_studio = nullptronload_bbs_3mf/load_model_from_file/Model::read_from_archiveso CLI (src/Snapmaker_Orca.cpp) and existing tests keep compiling.log_substitutionsoverloads abovePlater::priv::load_files.config_substitutions): log if BambuStudio, else dialog.Skipped
show_substitutions_infois theread_from_file/ STL-adjacent path, not the archive project load. Left alone.G-code
None.
Overlaps
load_filesnear the reset branch. Adjacent-hunk conflict; whichever lands second rebases. This PR does not modify Keep per-volume settings when adding a 3MF (Snapmaker #962) #350.Screenshots/Recordings/Graphs
N/A.
Tests
tests/libslic3r/test_3mf.cpp: Edge-stamped file → flag false;BambuStudio-02.03.00.70→ true;Snapmaker_Orca-2.2.0→ false.Owed:
libslic3r_tests "[3mf][Regression]"(new generator-flag case)Fast-lane build and test (2026-10-12)
Built and tested together with the other fast-lane PRs on
test/cursor-fastlane(head558f0e3b93): origin/main2fe16dac57with #437, #401, #402, #398 and #404 merged. Ninja + unity + PCH build (agent_build.sh), test copy atC:\Dev\EdgeSlicerTest\fastlane.libslic3r_tests: 2026 cases, 2023 pass + 3 expected failures (the standing ones, unchanged).fff_print_tests: 394 cases, all pass (47303 assertions).slic3rutils_tests: 1007 cases, all pass (12815 assertions).20261011-1724-598616272d(nosrc/libslic3ror profile change between it and2fe16dac57). Every G-code file differs from the baseline in exactly one line, the; generated by ... on <date>stamp. The baseline sliced twice is identical the same way.The BambuStudio generator flag is set only for a BambuStudio Application stamppasses (43 assertions).stamplambda did not capturepath, sotest_3mf.cppdid not compile (C3493); (2) the gate is nowfrom_bambu_studio && file_version > Semver(2, 3, 2), as in Orca 16153 (OrcaSlicer only tagged its own 3MFs after 2.3.2, so an older BambuStudio-stamped file may be an Orca project and keeps the dialog). The Edge-specific stamp test stays, because Edge stamps its own projects From_BBS too.origin/mainand Harden AMF metadata and 3MF cyclic component walks #398 (conflict intests/libslic3r/test_3mf.cpp: both PRs appended a test at the same spot; both kept). Merge Harden AMF metadata and 3MF cyclic component walks #398 first; head6665a0ea14.Loading <path>: ...) and no dialog. An Edge project with an unknown key must still show the dialog.