Merge branch '5.9' into CURA-12164_fix-innerwall-seam-position

Ultimaker · Oct 16, 2024 · d8280d9 · d8280d9
2 parents 11811e1 + 13a4f07
commit d8280d9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/LayerPlan.cpp b/src/LayerPlan.cpp
@@ -2294,6 +2294,7 @@ void LayerPlan::writeGCode(GCodeExport& gcode)
             extruder_nr = extruder_plan.extruder_nr_;
 
             gcode.ResetLastEValueAfterWipe(prev_extruder);
+            gcode.writePrepareFansForNozzleSwitch();
 
             const RetractionAndWipeConfig& prev_retraction_config = storage_.retraction_wipe_config_per_extruder[prev_extruder];
             if (prev_retraction_config.retraction_hop_after_extruder_switch)
@@ -2306,8 +2307,6 @@ void LayerPlan::writeGCode(GCodeExport& gcode)
                 gcode.switchExtruder(extruder_nr, prev_retraction_config.extruder_switch_retraction_config);
             }
 
-            gcode.writePrepareFansForNozzleSwitch();
-
             { // require printing temperature to be met
                 constexpr bool wait = true;
                 gcode.writeTemperatureCommand(extruder_nr, extruder_plan.required_start_temperature_, wait);

diff --git a/src/TreeSupport.cpp b/src/TreeSupport.cpp
@@ -2093,6 +2093,17 @@ void TreeSupport::filterFloatingLines(std::vector<Shape>& support_layer_storage)
             if (! found)
             {
                 next_removed_holes_by_idx.emplace(idx);
+
+                // Individual pieces of the hole could still be valid (if the 'hole' is made by branches surrounding others' for instance).
+                for (const auto& poly : hole)
+                {
+                    if (poly.area() < 0)
+                    {
+                        auto poly_copy = poly;
+                        poly_copy.reverse();
+                        valid_holes[layer_idx].push_back(poly_copy);
+                    }
+                }
             }
             else
             {