Fix loading of ascii stl files with MacOS line-ends.

diff --git a/Cura/util/stl.py b/Cura/util/stl.py
index 4e33f1104859865672afe9b070b10020d29b1343..699e0aa23dd532bc76ebfa3f8ecaf6714dde0471 100644 (file)
--- a/Cura/util/stl.py
+++ b/Cura/util/stl.py
@@ -21,16 +21,18 @@ class stlModel(mesh.mesh):
        
        def _loadAscii(self, f):
                cnt = 0
-               for line in f:
-                       if 'vertex' in line:
-                               cnt += 1
+               for lines in f:
+                       for line in lines.split('\r'):
+                               if 'vertex' in line:
+                                       cnt += 1
                self._prepareVertexCount(int(cnt))
                f.seek(5, os.SEEK_SET)
                cnt = 0
-               for line in f:
-                       if 'vertex' in line:
-                               data = line.split()
-                               self.addVertex(float(data[1]), float(data[2]), float(data[3]))
+               for lines in f:
+                       for line in lines.split('\r'):
+                               if 'vertex' in line:
+                                       data = line.split()
+                                       self.addVertex(float(data[1]), float(data[2]), float(data[3]))
 
        def _loadBinary(self, f):
                #Skip the header