|
|
@@ -1,6 +1,6 @@
|
|
|
-# Copyright (c) 2018 Ultimaker B.V.
|
|
|
+# Copyright (c) 2019 Ultimaker B.V.
|
|
|
# Cura is released under the terms of the LGPLv3 or higher.
|
|
|
-from UM.Scene.Camera import Camera
|
|
|
+
|
|
|
from cura.Scene.CuraSceneNode import CuraSceneNode
|
|
|
from cura.Settings.ExtruderManager import ExtruderManager
|
|
|
from UM.Application import Application #To modify the maximum zoom level.
|
|
|
@@ -1027,6 +1027,7 @@ class BuildVolume(SceneNode):
|
|
|
adhesion_type = container_stack.getProperty("adhesion_type", "value")
|
|
|
skirt_brim_line_width = self._global_container_stack.getProperty("skirt_brim_line_width", "value")
|
|
|
initial_layer_line_width_factor = self._global_container_stack.getProperty("initial_layer_line_width_factor", "value")
|
|
|
+ #Use brim width if brim is enabled OR the prime tower has a brim.
|
|
|
if adhesion_type == "brim" or (self._global_container_stack.getProperty("prime_tower_brim_enable", "value") and
|
|
|
adhesion_type != "raft"):
|
|
|
brim_line_count = self._global_container_stack.getProperty("brim_line_count", "value")
|
|
|
@@ -1037,7 +1038,7 @@ class BuildVolume(SceneNode):
|
|
|
|
|
|
# We don't create an additional line for the extruder we're printing the brim with.
|
|
|
bed_adhesion_size -= skirt_brim_line_width * initial_layer_line_width_factor / 100.0
|
|
|
- elif adhesion_type == "skirt":
|
|
|
+ elif adhesion_type == "skirt": #No brim? Also not on prime tower? Then use whatever the adhesion type is saying: Skirt, raft or none.
|
|
|
skirt_distance = self._global_container_stack.getProperty("skirt_gap", "value")
|
|
|
skirt_line_count = self._global_container_stack.getProperty("skirt_line_count", "value")
|
|
|
|
Ghostkeeper