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

Merge branch '3.2'

Browse source
This commit is contained in:
Ghostkeeper 2018-01-22 15:38:23 +01:00
commit 292556b4b3
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/CuraApplication.py
View file

@ -1078,7 +1078,7 @@ class CuraApplication(QtApplication):
continue # Node that doesnt have a mesh and is not a group.
if only_selectable and not node.isSelectable():
continue
if not node.callDecoration("isSliceable"):
if not node.callDecoration("isSliceable") and not node.callDecoration("getLayerData"):
continue # Only remove nodes that are selectable.
if node.getParent() and node.getParent().callDecoration("isGroup"):
continue # Grouped nodes don't need resetting as their parent (the group) is resetted)
@ -1094,10 +1094,6 @@ class CuraApplication(QtApplication):
# Reset the print information:
self.getController().getScene().sceneChanged.emit(node)
# self._print_information.setToZeroPrintInformation(self.getBuildPlateModel().activeBuildPlate)
# stay on the same build plate
#self.getCuraSceneController().setActiveBuildPlate(0) # Select first build plate
## Reset all translation on nodes with mesh data.
@pyqtSlot()

6
plugins/3MFReader/ThreeMFWorkspaceReader.py
View file

@ -928,9 +928,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
# sanity checks
# 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!",
changes_container_type, global_stack.getId())
continue
# 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,
@ -954,9 +955,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
# sanity checks
# 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!",
changes_container_type, each_extruder_stack.getId())
continue
# NOTE: we can get an empty container here, but the IDs will not match,
# so this comparison is fine.

2
plugins/3MFWriter/ThreeMFWorkspaceWriter.py
View file

@ -97,7 +97,7 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter):
file_in_archive.compress_type = zipfile.ZIP_DEFLATED
# Do not include the network authentication keys
ignore_keys = {"network_authentication_id", "network_authentication_key"}
ignore_keys = {"network_authentication_id", "network_authentication_key", "octoprint_api_key"}
serialized_data = container.serialize(ignored_metadata_keys = ignore_keys)
archive.writestr(file_in_archive, serialized_data)