3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 04:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Don't give an error when reading normal 3MF files

Browse source 
We have a signalling return value for this case. Let's use it.

Contributes to issue CURA-4810.
This commit is contained in:
Ghostkeeper 2018-01-16 10:32:37 +01:00
parent 24eff5f8b8
commit 063eb8e5cd
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -168,11 +168,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
Logger.log("w", "Unknown definition container type %s for %s", Logger.log("w", "Unknown definition container type %s for %s",
definition_container_type, each_definition_container_file) definition_container_type, each_definition_container_file)
Job.yieldThread() Job.yieldThread()
# sanity check
if machine_definition_container_count != 1: if machine_definition_container_count != 1:
msg = "Expecting one machine definition container but got %s" % machine_definition_container_count return WorkspaceReader.PreReadResult.failed #Not a workspace file but ordinary 3MF.
Logger.log("e", msg)
raise RuntimeError(msg)
material_labels = [] material_labels = []
material_conflict = False material_conflict = False