Merge branch 'main' into enh-port-edit-gcode-dlg

This commit is contained in:
Ocraftyone
2024-01-08 22:41:35 -05:00
committed by GitHub
87 changed files with 687 additions and 270 deletions

View File

@@ -5948,7 +5948,8 @@ inline std::string polygon_to_string(const Polygon &polygon, Print *print, bool
// this id is used to generate unique object id for each object.
std::string GCode::set_object_info(Print *print) {
const auto gflavor = print->config().gcode_flavor.value;
if (gflavor != gcfKlipper && gflavor != gcfMarlinLegacy && gflavor != gcfMarlinFirmware && gflavor != gcfRepRapFirmware)
if (print->is_BBL_printer() ||
(gflavor != gcfKlipper && gflavor != gcfMarlinLegacy && gflavor != gcfMarlinFirmware && gflavor != gcfRepRapFirmware))
return "";
std::ostringstream gcode;
size_t object_id = 0;