From c57f0e2586eb171763aee1b80b9ed1252a83bf04 Mon Sep 17 00:00:00 2001 From: daid303 Date: Fri, 8 Mar 2013 10:06:36 +0100 Subject: [PATCH] Fix the collada loading bug, fix the mesh is unloaded after slicing bug. --- Cura/gui/preview3d.py | 4 ++-- Cura/util/meshLoaders/dae.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py index 162bbc65..df36953e 100644 --- a/Cura/gui/preview3d.py +++ b/Cura/gui/preview3d.py @@ -291,7 +291,7 @@ class previewPanel(wx.Panel): if mode == "GCode": self.viewSelection.setValue(4) wx.CallAfter(self.glCanvas.Refresh) - + def loadModelFiles(self, filelist, showWarning = False): while len(filelist) > len(self.objectList): self.objectList.append(previewObject()) @@ -304,8 +304,8 @@ class previewPanel(wx.Panel): obj.fileTime = None self.gcodeFileTime = None self.logFileTime = None + obj.mesh = None obj.filename = filelist[idx] - obj.mesh = None self.deselectTool() self.gcodeFilename = sliceRun.getExportFilename(filelist[0]) diff --git a/Cura/util/meshLoaders/dae.py b/Cura/util/meshLoaders/dae.py index 4332ea16..ba830a9e 100644 --- a/Cura/util/meshLoaders/dae.py +++ b/Cura/util/meshLoaders/dae.py @@ -30,7 +30,7 @@ class daeModel(mesh.mesh): self._ProcessNode2(node) scale = float(self._base['collada'][0]['asset'][0]['unit'][0]['_meter']) * 1000 - self.origonalVertexes *= scale + self.vertexes *= scale self._base = None self._cur = None -- 2.30.2