Merge remote-tracking branch 'origin/3.2'

This commit is contained in:
Lipu Fei 2018-02-01 11:23:20 +01:00
commit 25713a6e64
6 changed files with 111 additions and 17 deletions

View file

@ -1,4 +1,4 @@
# Copyright (c) 2017 Ultimaker B.V.
# Copyright (c) 2018 Ultimaker B.V.
# Uranium is released under the terms of the LGPLv3 or higher.
from UM.Settings.ContainerRegistry import ContainerRegistry
@ -21,8 +21,7 @@ class UM2UpgradeSelection(MachineAction):
self._current_global_stack = None
from cura.CuraApplication import CuraApplication
CuraApplication.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged)
Application.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged)
self._reset()
def _reset(self):