Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Tim Kuipers 2016-08-08 09:52:34 +02:00
commit 0ca2985293

View File

@ -320,11 +320,11 @@ class ExtruderManager(QObject):
# \param extruder_index The index of the extruder to get the value from. # \param extruder_index The index of the extruder to get the value from.
# \param key The key of the setting to get the value of. # \param key The key of the setting to get the value of.
# #
# \return The value of the setting for the specified extruder or None if not found. # \return The value of the setting for the specified extruder or for the
# global stack if not found.
@staticmethod @staticmethod
def getExtruderValue(extruder_index, key): def getExtruderValue(extruder_index, key):
extruder = ExtruderManager.getInstance().getExtruderStack(extruder_index) extruder = ExtruderManager.getInstance().getExtruderStack(extruder_index)
value = None
if extruder: if extruder:
value = extruder.getRawProperty(key, "value") value = extruder.getRawProperty(key, "value")