Browse Source

Merge branch 'fieldOfView-feature_object_name'

Ghostkeeper 5 years ago
parent
commit
be85e6d75e
2 changed files with 5 additions and 1 deletions
  1. 4 1
      plugins/3MFReader/ThreeMFReader.py
  2. 1 0
      plugins/3MFWriter/ThreeMFWriter.py

+ 4 - 1
plugins/3MFReader/ThreeMFReader.py

@@ -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
 

+ 1 - 0
plugins/3MFWriter/ThreeMFWriter.py

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