3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Check when the containers are empty instead of None. Contributes to CURA-4845

Browse source
This commit is contained in:
Diego Prado Gesto 2018-01-22 13:12:22 +01:00
parent 5c8a47275e
commit 20da35ec5c
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -928,9 +928,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
# sanity checks # sanity checks
# NOTE: The following cases SHOULD NOT happen!!!! # NOTE: The following cases SHOULD NOT happen!!!!
if not old_container: if old_container.getId() in ("empty_quality_changes", "empty_definition_changes", "empty"):
Logger.log("e", "We try to get [%s] from the global stack [%s] but we got None instead!", Logger.log("e", "We try to get [%s] from the global stack [%s] but we got None instead!",
changes_container_type, global_stack.getId()) changes_container_type, global_stack.getId())
continue
# Replace the quality/definition changes container if it's in the GlobalStack # Replace the quality/definition changes container if it's in the GlobalStack
# NOTE: we can get an empty container here, but the IDs will not match, # NOTE: we can get an empty container here, but the IDs will not match,
@ -954,9 +955,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
# sanity checks # sanity checks
# NOTE: The following cases SHOULD NOT happen!!!! # NOTE: The following cases SHOULD NOT happen!!!!
if not changes_container: if changes_container.getId() in ("empty_quality_changes", "empty_definition_changes", "empty"):
Logger.log("e", "We try to get [%s] from the extruder stack [%s] but we got None instead!", Logger.log("e", "We try to get [%s] from the extruder stack [%s] but we got None instead!",
changes_container_type, each_extruder_stack.getId()) changes_container_type, each_extruder_stack.getId())
continue
# NOTE: we can get an empty container here, but the IDs will not match, # NOTE: we can get an empty container here, but the IDs will not match,
# so this comparison is fine. # so this comparison is fine.