Merge branch 'master' into CURA-5334_extruder_def_for_all

This commit is contained in:
Jack Ha 2018-06-11 16:56:42 +02:00
commit c97f276583
21 changed files with 131 additions and 115 deletions

View file

@ -501,15 +501,6 @@ class ExtruderManager(QObject):
def getInstanceExtruderValues(self, key):
return ExtruderManager.getExtruderValues(key)
## Updates the material container to a material that matches the material diameter set for the printer
def updateMaterialForDiameter(self, extruder_position: int, global_stack = None):
if not global_stack:
global_stack = Application.getInstance().getGlobalContainerStack()
if not global_stack:
return
Application.getInstance().getMachineManager()._updateMaterialWithVariant(extruder_position)
## Get the value for a setting from a specific extruder.
#
# This is exposed to SettingFunction to use in value functions.