diff options
author | Ghostkeeper <rubend@tutanota.com> | 2021-05-27 16:21:38 +0300 |
---|---|---|
committer | Ghostkeeper <rubend@tutanota.com> | 2021-05-27 16:21:38 +0300 |
commit | 8e12d491609466bed3bd3fc19d9e52da3df612de (patch) | |
tree | 7b29e15b5f81b84cd9e1df5d9acfba0a0b3e1fd0 /cura | |
parent | 48d1715c2db871af2a10a66fdcb3f2dc2f5aeadc (diff) | |
parent | 6ec61a6a11f6f44a5026f9a81019174ca0d6997f (diff) |
Merge branch 'master' of github.com:Ultimaker/Cura
Diffstat (limited to 'cura')
-rwxr-xr-x | cura/CuraApplication.py | 1 | ||||
-rw-r--r-- | cura/OAuth2/AuthorizationService.py | 6 | ||||
-rw-r--r-- | cura/Scene/CuraSceneNode.py | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index c72ad0ae90..ea9eb97376 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1863,6 +1863,7 @@ class CuraApplication(QtApplication): else: node = CuraSceneNode() node.setMeshData(original_node.getMeshData()) + node.source_mime_type = original_node.source_mime_type # Setting meshdata does not apply scaling. if original_node.getScale() != Vector(1.0, 1.0, 1.0): diff --git a/cura/OAuth2/AuthorizationService.py b/cura/OAuth2/AuthorizationService.py index da654b52bb..96091f9c11 100644 --- a/cura/OAuth2/AuthorizationService.py +++ b/cura/OAuth2/AuthorizationService.py @@ -113,8 +113,10 @@ class AuthorizationService: # The token could not be refreshed using the refresh token. We should login again. return None # Ensure it gets stored as otherwise we only have it in memory. The stored refresh token has been deleted - # from the server already. - self._storeAuthData(self._auth_data) + # from the server already. Do not store the auth_data if we could not get new auth_data (eg due to a + # network error), since this would cause an infinite loop trying to get new auth-data + if self._auth_data.success: + self._storeAuthData(self._auth_data) return self._auth_helpers.parseJWT(self._auth_data.access_token) def getAccessToken(self) -> Optional[str]: diff --git a/cura/Scene/CuraSceneNode.py b/cura/Scene/CuraSceneNode.py index 9b5c432b36..ec832b8ec7 100644 --- a/cura/Scene/CuraSceneNode.py +++ b/cura/Scene/CuraSceneNode.py @@ -143,6 +143,7 @@ class CuraSceneNode(SceneNode): copy.setTransformation(self.getLocalTransformation(copy= False)) copy.setMeshData(self._mesh_data) copy.setVisible(cast(bool, deepcopy(self._visible, memo))) + copy.source_mime_type = cast(str, deepcopy(self.source_mime_type, memo)) copy._selectable = cast(bool, deepcopy(self._selectable, memo)) copy._name = cast(str, deepcopy(self._name, memo)) for decorator in self._decorators: |