Merge branch 'feature_object_name' of https://github.com/fieldOfView/Cura into fieldOfView-feature_object_name

This commit is contained in:
Ghostkeeper 2020-03-26 17:39:25 +01:00
commit afea4a76e7
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
2 changed files with 5 additions and 1 deletions

View file

@ -88,7 +88,10 @@ class ThreeMFReader(MeshReader):
# \returns Scene node.
def _convertSavitarNodeToUMNode(self, savitar_node: Savitar.SceneNode, file_name: str = "") -> Optional[SceneNode]:
self._object_count += 1
node_name = "Object %s" % self._object_count
node_name = savitar_node.getName()
if node_name == "":
node_name = "Object %s" % self._object_count
active_build_plate = CuraApplication.getInstance().getMultiBuildPlateModel().activeBuildPlate

View file

@ -77,6 +77,7 @@ class ThreeMFWriter(MeshWriter):
return
savitar_node = Savitar.SceneNode()
savitar_node.setName(um_node.getName())
node_matrix = um_node.getLocalTransformation()