diff options
| author | fieldOfView <aldo@fieldofview.com> | 2020-03-02 00:49:58 +0300 |
|---|---|---|
| committer | fieldOfView <aldo@fieldofview.com> | 2020-03-02 00:49:58 +0300 |
| commit | 7cab2b876cbf008b22b718a380163120827f8928 (patch) | |
| tree | 29bd8635f0e7c02208d1b5e10f34f5f98aaaa447 /plugins/TrimeshReader | |
| parent | 7c70ace8f0b08a3d1e896901e53b4ab6a5d565f5 (diff) | |
Fix watching for changes in AMF and trimesh-loaded files
Fixes #7192
Diffstat (limited to 'plugins/TrimeshReader')
| -rw-r--r-- | plugins/TrimeshReader/TrimeshReader.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/TrimeshReader/TrimeshReader.py b/plugins/TrimeshReader/TrimeshReader.py index 91f8423579..6ed7435f88 100644 --- a/plugins/TrimeshReader/TrimeshReader.py +++ b/plugins/TrimeshReader/TrimeshReader.py @@ -108,7 +108,7 @@ class TrimeshReader(MeshReader): mesh.merge_vertices() mesh.remove_unreferenced_vertices() mesh.fix_normals() - mesh_data = self._toMeshData(mesh) + mesh_data = self._toMeshData(mesh, file_name) file_base_name = os.path.basename(file_name) new_node = CuraSceneNode() @@ -133,9 +133,10 @@ class TrimeshReader(MeshReader): ## Converts a Trimesh to Uranium's MeshData. # \param tri_node A Trimesh containing the contents of a file that was # just read. + # \param file_name The full original filename used to watch for changes # \return Mesh data from the Trimesh in a way that Uranium can understand # it. - def _toMeshData(self, tri_node: trimesh.base.Trimesh) -> MeshData: + def _toMeshData(self, tri_node: trimesh.base.Trimesh, file_name: str = "") -> MeshData: tri_faces = tri_node.faces tri_vertices = tri_node.vertices @@ -157,5 +158,5 @@ class TrimeshReader(MeshReader): indices = numpy.asarray(indices, dtype = numpy.int32) normals = calculateNormalsFromIndexedVertices(vertices, indices, face_count) - mesh_data = MeshData(vertices = vertices, indices = indices, normals = normals) + mesh_data = MeshData(vertices = vertices, indices = indices, normals = normals, file_name = file_name) return mesh_data
\ No newline at end of file |