diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 77cce9cddb..d3e85db107 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -738,22 +738,6 @@ class MachineManager(QObject): return result - ## Property to indicate if a machine has "specialized" material profiles. - # Some machines have their own material profiles that "override" the default catch all profiles. - @pyqtProperty(bool, notify = globalContainerChanged) - def filterMaterialsByMachine(self) -> bool: - if self._global_container_stack: - return Util.parseBool(self._global_container_stack.getMetaDataEntry("has_machine_materials", False)) - return False - - ## Property to indicate if a machine has "specialized" quality profiles. - # Some machines have their own quality profiles that "override" the default catch all profiles. - @pyqtProperty(bool, notify = globalContainerChanged) - def filterQualityByMachine(self) -> bool: - if self._global_container_stack: - return Util.parseBool(self._global_container_stack.getMetaDataEntry("has_machine_quality", False)) - return False - ## Get the Definition ID of a machine (specified by ID) # \param machine_id string machine id to get the definition ID of # \returns DefinitionID (string) if found, None otherwise diff --git a/resources/qml/Preferences/MaterialView.qml b/resources/qml/Preferences/MaterialView.qml index ffc4eaba3a..3b1c10fbbd 100644 --- a/resources/qml/Preferences/MaterialView.qml +++ b/resources/qml/Preferences/MaterialView.qml @@ -233,7 +233,7 @@ TabView var old_diameter = Cura.ContainerManager.getContainerProperty(base.containerId, "material_diameter", "value").toString(); var old_approximate_diameter = Cura.ContainerManager.getContainerMetaDataEntry(base.containerId, "approximate_diameter"); var new_approximate_diameter = getApproximateDiameter(value); - if (Cura.MachineManager.filterMaterialsByMachine && new_approximate_diameter != Cura.ExtruderManager.getActiveExtruderStack().approximateMaterialDiameter) + if (new_approximate_diameter != Cura.ExtruderManager.getActiveExtruderStack().approximateMaterialDiameter) { confirmDiameterChangeDialog.old_diameter_value = old_diameter; confirmDiameterChangeDialog.new_diameter_value = value;