mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-07-26 04:12:07 +00:00
Merge upstream/main into belt/rebase/may-18
Reconciles the belt-printer branch with upstream PRs through #13723. Six files had conflicts; three additional files needed manual follow-up fixes where the auto-merge produced code that referenced upstream-renamed fields or changed function signatures. Notable reconciliations: - TreeSupport.cpp: kept belt-floor early-exit branches around HEAD's drop-down logic, folded upstream's `(distance_to_top > 0 ? 1 : 0)` formula into the non-belt-floor path (upstream PR #11812). Dropped dead `roof_enabled`/`force_tip_to_roof` locals. - TreeSupport3D.cpp: combined upstream's safety-offset + remove_small changes with HEAD's belt-floor clip in the per-slice trim loop. Dropped HEAD's `else` block (superseded by upstream's rewritten bottom-contact propagation) and re-added the belt-floor clip into the new propagation loop. Gated the propagation on belt printers to prevent OOM when belt-floor clipping produces empty initial slices. - TriangleSelector.{cpp,hpp}: merged both new `select_patch` parameters (HEAD's `up_direction` and upstream's `select_partially`); body uses `dot(up_direction)` for the overhang angle check and forwards `select_partially` to `select_triangle`. - SupportMaterial.cpp: `slicing_params.soluble_interface` → `zero_gap_interface_bottom` in HEAD's `detect_belt_floor_bottom_contacts`, matching upstream's same-purpose rename at line 2495. - Custom.json, GCodeWriter.cpp: simple additive merges (kept entries / includes from both sides). Verified by building OrcaSlicer (RelWithDebInfo) after a full deps rebuild (Eigen v5.0.1, libigl v2.6.0 are now managed deps) and slicing a scaled Benchy on the NORMALIZER belt-printer profile without OOM. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -20,6 +20,10 @@
|
||||
"name": "Generic RRF Printer",
|
||||
"sub_path": "machine/MyRRF.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic Repetier Printer",
|
||||
"sub_path": "machine/MyRepetier.json"
|
||||
},
|
||||
{
|
||||
"name": "Generic ToolChanger Printer",
|
||||
"sub_path": "machine/MyToolChanger.json"
|
||||
@@ -42,6 +46,11 @@
|
||||
"name": "fdm_process_rrf_common",
|
||||
"sub_path": "process/fdm_process_rrf_common.json"
|
||||
},
|
||||
{
|
||||
"name": "fdm_process_repetier_common",
|
||||
"sub_path": "process/fdm_process_repetier_common.json"
|
||||
},
|
||||
|
||||
{
|
||||
"name": "0.08mm Extra Fine @MyKlipper",
|
||||
"sub_path": "process/0.08mm Extra Fine @MyKlipper.json"
|
||||
@@ -134,6 +143,10 @@
|
||||
"name": "0.28mm Extra Draft @MyRRF",
|
||||
"sub_path": "process/0.28mm Extra Draft @MyRRF.json"
|
||||
},
|
||||
{
|
||||
"name": "0.20mm Standard @MyRepetier",
|
||||
"sub_path": "process/0.20mm Standard @MyRepetier.json"
|
||||
},
|
||||
{
|
||||
"name": "0.08mm Extra Fine @MyToolChanger",
|
||||
"sub_path": "process/0.08mm Extra Fine @MyToolChanger.json"
|
||||
@@ -234,6 +247,10 @@
|
||||
"name": "fdm_rrf_common",
|
||||
"sub_path": "machine/fdm_rrf_common.json"
|
||||
},
|
||||
{
|
||||
"name": "fdm_repetier_common",
|
||||
"sub_path": "machine/fdm_repetier_common.json"
|
||||
},
|
||||
{
|
||||
"name": "MyKlipper 0.2 nozzle",
|
||||
"sub_path": "machine/MyKlipper 0.2 nozzle.json"
|
||||
@@ -278,6 +295,10 @@
|
||||
"name": "MyBeltPrinter 0.8 nozzle",
|
||||
"sub_path": "machine/MyBeltPrinter 0.8 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "MyRepetier 0.4 nozzle",
|
||||
"sub_path": "machine/MyRepetier 0.4 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "MyToolChanger 0.2 nozzle",
|
||||
"sub_path": "machine/MyToolChanger 0.2 nozzle.json"
|
||||
|
||||
Reference in New Issue
Block a user