Fix the collada loading bug, fix the mesh is unloaded after slicing bug.

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index 162bbc654e4c2eef02fd074ec4b5519e41aa1584..df36953e962502f1b5bf5ec440903f6af27a9c0c 100644 (file)
--- 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 4332ea16db9a0038851a3b6030e9b7770f311a2e..ba830a9e16d2065e2481ae1f8f996237072ccff5 100644 (file)
--- 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