Fix merge conflicts from master

This commit is contained in:
Lipu Fei 2018-02-28 12:52:45 +01:00
commit 6b0095014a
2 changed files with 16 additions and 5 deletions

View file

@ -778,6 +778,12 @@ class MachineManager(QObject):
stacks.append(self._global_container_stack)
return [ s.containersChanged for s in stacks ]
@pyqtSlot(str, str, str)
def setSettingForAllExtruders(self, setting_name: str, property_name: str, property_value: str):
for key, extruder in self._global_container_stack.extruders.items():
container = extruder.userChanges
container.setProperty(setting_name, property_name, property_value)
#
# New
#