Remove bit of code duplication

CURA-7106
This commit is contained in:
Jaime van Kessel 2020-06-22 16:31:37 +02:00
parent 61def4ba25
commit 1b973b3f3c
No known key found for this signature in database
GPG key ID: 3710727397403C91
2 changed files with 1 additions and 6 deletions

View file

@ -104,7 +104,7 @@ class SettingOverrideDecorator(SceneNodeDecorator):
""" """
# for support_meshes, always use the support_extruder # for support_meshes, always use the support_extruder
if self.getStack().getProperty("support_mesh", "value"): if self.getStack().userChanges.getProperty("support_mesh", "value"):
global_container_stack = Application.getInstance().getGlobalContainerStack() global_container_stack = Application.getInstance().getGlobalContainerStack()
if global_container_stack: if global_container_stack:
return str(global_container_stack.getProperty("support_extruder_nr", "value")) return str(global_container_stack.getProperty("support_extruder_nr", "value"))

View file

@ -198,11 +198,6 @@ class SolidView(View):
extruder_index = "0" extruder_index = "0"
extruder_index = int(extruder_index) extruder_index = int(extruder_index)
# Use the support extruder instead of the active extruder if this is a support_mesh
if per_mesh_stack:
if per_mesh_stack.getProperty("support_mesh", "value"):
extruder_index = int(global_container_stack.getExtruderPositionValueWithDefault("support_extruder_nr"))
try: try:
material_color = self._extruders_model.getItem(extruder_index)["color"] material_color = self._extruders_model.getItem(extruder_index)["color"]
except KeyError: except KeyError: