Merge branch 'master' into CURA-7615_store_metadata

This commit is contained in:
Ghostkeeper 2021-02-08 16:27:38 +01:00
commit c89a397e59
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
172 changed files with 3761 additions and 447 deletions

View file

@ -51,6 +51,10 @@ class ThreeMFReader(MeshReader):
self._root = None
self._base_name = ""
self._unit = None
self._empty_project = False
def emptyFileHintSet(self) -> bool:
return self._empty_project
def _createMatrixFromTransformationString(self, transformation: str) -> Matrix:
if transformation == "":
@ -196,6 +200,7 @@ class ThreeMFReader(MeshReader):
return um_node
def _read(self, file_name: str) -> Union[SceneNode, List[SceneNode]]:
self._empty_project = False
result = []
# The base object of 3mf is a zipped archive.
try:
@ -264,6 +269,9 @@ class ThreeMFReader(MeshReader):
result.append(um_node)
if len(result) == 0:
self._empty_project = True
except Exception:
Logger.logException("e", "An exception occurred in 3mf reader.")
return []