From 666bbbb6b048f23bd30cd8d95267bd970a2fc4b4 Mon Sep 17 00:00:00 2001
From: daid <daid303@gmail.com>
Date: Mon, 7 May 2012 18:12:26 +0200
Subject: [PATCH] What was I smoking? This code is much simpler this way.

---
 Cura/cura_sf/fabmetheus_utilities/settings.py |  2 +-
 Cura/gui/preview3d.py                         | 31 +++++++------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/Cura/cura_sf/fabmetheus_utilities/settings.py b/Cura/cura_sf/fabmetheus_utilities/settings.py
index fa79a29c..f5d76296 100644
--- a/Cura/cura_sf/fabmetheus_utilities/settings.py
+++ b/Cura/cura_sf/fabmetheus_utilities/settings.py
@@ -138,7 +138,7 @@ def getProfileInformation():
 			'Widen_Width_over_Edge_Width_ratio': DEFSET,
 		},'inset': {
 			'Add_Custom_Code_for_Temperature_Reading': "False",
-			'Infill_in_Direction_of_Bridge': "True",
+			'Infill_in_Direction_of_Bridge': ifSettingAboveZero('fill_density'),
 			'Infill_Width': storedSettingFloat("nozzle_size"),
 			'Loop_Order_Choice': DEFSET,
 			'Overlap_Removal_Width_over_Perimeter_Width_ratio': DEFSET,
diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index 190cbb09..372ec4e3 100644
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -447,39 +447,30 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
 				self.gcodeDisplayList = glGenLists(len(self.parent.gcode.layerList));
 				self.gcodeDisplayListCount = len(self.parent.gcode.layerList)
 			self.parent.gcodeDirty = False
-			self.gcodeDisplayListMade = []
-			for idx in xrange(0, len(self.parent.gcode.layerList)):
-				self.gcodeDisplayListMade.append(False)
+			self.gcodeDisplayListMade = 0
 		
-		if self.gcodeDisplayListMade != None:
-			curLayerNum = 0
-			for layer in self.parent.gcode.layerList:
-				if not self.gcodeDisplayListMade[curLayerNum]:
-					glNewList(self.gcodeDisplayList + curLayerNum, GL_COMPILE)
-					opengl.DrawGCodeLayer(layer)
-					glEndList()
-					self.gcodeDisplayListMade[curLayerNum] = True
-					self.Refresh()
-					break
-				curLayerNum += 1
-			if curLayerNum == len(self.parent.gcode.layerList):
-				self.gcodeDisplayListMade = None
+		if self.parent.gcode != None and self.gcodeDisplayListMade < len(self.parent.gcode.layerList):
+			glNewList(self.gcodeDisplayList + self.gcodeDisplayListMade, GL_COMPILE)
+			opengl.DrawGCodeLayer(self.parent.gcode.layerList[self.gcodeDisplayListMade])
+			glEndList()
+			self.gcodeDisplayListMade += 1
+			self.Refresh()
 		
 		if self.parent.gcode != None and (self.viewMode == "GCode" or self.viewMode == "Mixed"):
 			glEnable(GL_COLOR_MATERIAL)
 			glEnable(GL_LIGHTING)
-			for i in xrange(0, self.parent.layerSpin.GetValue() + 1):
+			drawUpToLayer = min(self.gcodeDisplayListMade, self.parent.layerSpin.GetValue() + 1)
+			for i in xrange(0, drawUpToLayer):
 				c = 1.0
 				if i < self.parent.layerSpin.GetValue():
-					c = 0.9 - (self.parent.layerSpin.GetValue() - i) * 0.1
+					c = 0.9 - (drawUpToLayer - i) * 0.1
 					if c < 0.4:
 						c = (0.4 + c) / 2
 					if c < 0.1:
 						c = 0.1
 				glLightfv(GL_LIGHT0, GL_DIFFUSE, [0,0,0,0])
 				glLightfv(GL_LIGHT0, GL_AMBIENT, [c,c,c,c])
-				if self.gcodeDisplayListMade == None or self.gcodeDisplayListMade[i]:
-					glCallList(self.gcodeDisplayList + i)
+				glCallList(self.gcodeDisplayList + i)
 			glDisable(GL_LIGHTING)
 			glDisable(GL_COLOR_MATERIAL)
 			glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, [0.2, 0.2, 0.2, 1.0]);
-- 
2.30.2