Merge branch 'feature_bed_adhesion_none' of github.com:Ultimaker/Cura

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?")
 

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") +

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]

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')",