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

Fixed reloading meshes for 3mf

Browse source 
CURA-1622
This commit is contained in:
Jaime van Kessel 2016-07-20 13:05:45 +02:00
parent 612bb39680
commit 6ec69d523b
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/CuraApplication.py
View file

@ -851,7 +851,11 @@ class CuraApplication(QtApplication):
def _reloadMeshFinished(self, job): def _reloadMeshFinished(self, job):
# TODO; This needs to be fixed properly. We now make the assumption that we only load a single mesh! # TODO; This needs to be fixed properly. We now make the assumption that we only load a single mesh!
job._node.setMeshData(job.getResult().getMeshData()) mesh_data = job.getResult().getMeshData()
if mesh_data:
job._node.setMeshData(job.getResult().getMeshData())
else:
Logger.log("w", "Could not find a mesh in reloaded node.")
def _openFile(self, file): def _openFile(self, file):
job = ReadMeshJob(os.path.abspath(file)) job = ReadMeshJob(os.path.abspath(file))

2
plugins/3MFReader/ThreeMFReader.py
View file

@ -111,6 +111,8 @@ class ThreeMFReader(MeshReader):
if len(objects) > 1: if len(objects) > 1:
group_decorator = GroupDecorator() group_decorator = GroupDecorator()
result.addDecorator(group_decorator) result.addDecorator(group_decorator)
elif len(objects) == 1:
result = result.getChildren()[0] # Only one object found, return that.
except Exception as e: except Exception as e:
Logger.log("e", "exception occured in 3mf reader: %s", e) Logger.log("e", "exception occured in 3mf reader: %s", e)