From: daid303 <daid303@gmail.com>
Date: Thu, 4 Oct 2012 10:24:43 +0000 (+0200)
Subject: Fix loading of ascii stl files with MacOS line-ends.
X-Git-Tag: 13.03~286
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6edb5c29ca54b38c7aafe11dd27b6bacebdc0228;p=cura.git

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

diff --git a/Cura/util/stl.py b/Cura/util/stl.py
index 4e33f110..699e0aa2 100644
--- 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