diff --git a/cura/Settings/CuraFormulaFunctions.py b/cura/Settings/CuraFormulaFunctions.py index d7b6228e090..93a4de28ec4 100644 --- a/cura/Settings/CuraFormulaFunctions.py +++ b/cura/Settings/CuraFormulaFunctions.py @@ -56,6 +56,9 @@ def getValueInExtruder(self, extruder_position: int, property_key: str, if isinstance(value, SettingFunction): value = value(extruder_stack, context = context) + if isinstance(value, str): + value = value.lower() + return value def _getActiveExtruders(self, context: Optional["PropertyEvaluationContext"] = None) -> List[str]: diff --git a/cura/UI/ObjectsModel.py b/cura/UI/ObjectsModel.py index 884d516f08f..4f642702474 100644 --- a/cura/UI/ObjectsModel.py +++ b/cura/UI/ObjectsModel.py @@ -69,7 +69,7 @@ def __init__(self, parent = None) -> None: self._group_name_template = catalog.i18nc("@label", "Group #{group_nr}") self._group_name_prefix = self._group_name_template.split("#")[0] - self._naming_regex = re.compile("^(.+)\(([0-9]+)\)$") + self._naming_regex = re.compile(r"^(.+)\(([0-9]+)\)$") def setActiveBuildPlate(self, nr: int) -> None: if self._build_plate_number != nr: diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d0d02363de7..ec07872e197 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4534,7 +4534,7 @@ "type": "extruder", "default_value": "0", "value": "support_extruder_nr", - "enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1", + "enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1 and support_interface_enable", "resolve": "max(extruderValues('support_interface_extruder_nr'))", "settable_per_mesh": false, "settable_per_extruder": false, @@ -4547,7 +4547,7 @@ "type": "extruder", "default_value": "0", "value": "support_interface_extruder_nr", - "enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1", + "enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1 and support_roof_enable", "resolve": "max(extruderValues('support_roof_extruder_nr'))", "settable_per_mesh": false, "settable_per_extruder": false @@ -4559,7 +4559,7 @@ "type": "extruder", "default_value": "0", "value": "support_interface_extruder_nr", - "enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1", + "enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1 and support_bottom_enable", "resolve": "max(extruderValues('support_bottom_extruder_nr'))", "settable_per_mesh": false, "settable_per_extruder": false