Merge pull request #1341 from Ultimaker/CURA-7774_fix_support_drops_through

konskarm · web-flow · commit 26cffb54a3bf · 2020-10-16T18:02:27.000+02:00
CURA-7774 Fix support drops 'through' model.
diff --git a/src/support.cpp b/src/support.cpp
@@ -1050,12 +1050,13 @@ void AreaSupport::generateSupportAreasForMesh(SliceDataStorage& storage, const S
         { // join with support from layer up
             const Polygons empty;
             const Polygons* layer_above = (layer_idx < support_areas.size()) ? &support_areas[layer_idx + 1] : &empty;
+            const Polygons model_mesh_on_layer = (layer_idx > 0) && !is_support_mesh_nondrop_place_holder ? storage.getLayerOutlines(layer_idx, no_support, no_prime_tower) : empty;
             if (is_support_mesh_nondrop_place_holder)
             {
                 layer_above = &empty;
                 layer_this = layer_this.unionPolygons(storage.support.supportLayers[layer_idx].support_mesh);
             }
-            layer_this = AreaSupport::join(storage, *layer_above, layer_this, smoothing_distance);
+            layer_this = AreaSupport::join(storage, *layer_above, layer_this, smoothing_distance).difference(model_mesh_on_layer);
         }
 
         // make towers for small support

Original file line number	Diff line number	Diff line change
`@@ -1050,12 +1050,13 @@ void AreaSupport::generateSupportAreasForMesh(SliceDataStorage& storage, const S`
`1050`	`1050`	`{ // join with support from layer up`
`1051`	`1051`	`const Polygons empty;`
`1052`	`1052`	`const Polygons* layer_above = (layer_idx < support_areas.size()) ? &support_areas[layer_idx + 1] : ∅`
	`1053`	`+ const Polygons model_mesh_on_layer = (layer_idx > 0) && !is_support_mesh_nondrop_place_holder ? storage.getLayerOutlines(layer_idx, no_support, no_prime_tower) : empty;`
`1053`	`1054`	`if (is_support_mesh_nondrop_place_holder)`
`1054`	`1055`	`{`
`1055`	`1056`	`layer_above = ∅`
`1056`	`1057`	`layer_this = layer_this.unionPolygons(storage.support.supportLayers[layer_idx].support_mesh);`
`1057`	`1058`	`}`
`1058`		`- layer_this = AreaSupport::join(storage, *layer_above, layer_this, smoothing_distance);`
	`1059`	`+ layer_this = AreaSupport::join(storage, *layer_above, layer_this, smoothing_distance).difference(model_mesh_on_layer);`
`1059`	`1060`	`}`
`1060`	`1061`
`1061`	`1062`	`// make towers for small support`