From b68c3b7301486f844811626ef320470e875e6a13 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 29 May 2020 18:06:02 +0200 Subject: [PATCH] Remove usage of deprecated extruders property Initially PyCharm didn't find this because it's not typed. Done during Turbo Testing and Tooling. --- cura/Machines/Models/BaseMaterialsModel.py | 3 +-- resources/qml/Toolbar.qml | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 97f1f4b646..aa8552bebb 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -178,8 +178,7 @@ class BaseMaterialsModel(ListModel): if global_stack is None or not self._enabled: return False - extruder_position = str(self._extruder_position) - if extruder_position not in global_stack.extruders: + if self._extruder_position >= len(global_stack.extruderList): return False return True diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml index 2e12f720a5..63f608d635 100644 --- a/resources/qml/Toolbar.qml +++ b/resources/qml/Toolbar.qml @@ -129,7 +129,6 @@ Item Repeater { - id: extruders width: childrenRect.width height: childrenRect.height model: extrudersModel.items.length > 1 ? extrudersModel : 0