diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 5c147d2006..534cae1bbb 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -701,6 +701,8 @@ class BuildVolume(SceneNode): bed_adhesion_size += value elif adhesion_type == "raft": bed_adhesion_size = self._getSettingFromAdhesionExtruder("raft_margin") + elif adhesion_type == "none": + bed_adhesion_size = 0 else: raise Exception("Unknown bed adhesion type. Did you forget to update the build volume calculations for your new bed adhesion type?") diff --git a/cura/ConvexHullDecorator.py b/cura/ConvexHullDecorator.py index a7d0775e21..c4b2fe0337 100644 --- a/cura/ConvexHullDecorator.py +++ b/cura/ConvexHullDecorator.py @@ -236,6 +236,8 @@ class ConvexHullDecorator(SceneNodeDecorator): extra_margin = max(0, self._getSettingProperty("raft_margin", "value")) elif adhesion_type == "brim": extra_margin = max(0, self._getSettingProperty("brim_line_count", "value") * self._getSettingProperty("skirt_brim_line_width", "value")) + elif adhesion_type == "none": + extra_margin = 0 elif adhesion_type == "skirt": extra_margin = max( 0, self._getSettingProperty("skirt_gap", "value") + diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 5517830141..a3eef51009 100644 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -336,8 +336,8 @@ class ExtruderManager(QObject): if support_interface_enabled: used_extruder_stack_ids.add(self.extruderIds[str(global_stack.getProperty("support_interface_extruder_nr", "value"))]) - #The platform adhesion extruder. Not used if using brim and brim width is 0. - if global_stack.getProperty("adhesion_type", "value") != "brim" or global_stack.getProperty("brim_line_count", "value") > 0: + #The platform adhesion extruder. Not used if using none. + if global_stack.getProperty("adhesion_type", "value") != "none": used_extruder_stack_ids.add(self.extruderIds[str(global_stack.getProperty("adhesion_extruder_nr", "value"))]) return [container_registry.findContainerStacks(id = stack_id)[0] for stack_id in used_extruder_stack_ids] diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8ac4f4f6e4..16a1e8f44d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2997,7 +2997,8 @@ { "skirt": "Skirt", "brim": "Brim", - "raft": "Raft" + "raft": "Raft", + "none": "None" }, "default_value": "brim", "resolve": "'raft' if 'raft' in extruderValues('adhesion_type') else ('brim' if 'brim' in extruderValues('adhesion_type') else 'skirt')",