Mercurial > ldforge / file diff

--- a/src/glCompiler.cc	Thu Jun 05 23:18:13 2014 +0300
+++ b/src/glCompiler.cc	Sat Jun 14 09:05:29 2014 +0300
@@ -155,23 +155,23 @@
 			break;
 
 		case VBOCM_NormalColors:
-			if (poly.color == maincolor)
+			if (poly.color == mainColorIndex)
 			{
-				if (topobj->color() == maincolor)
+				if (topobj->color() == maincolor())
 					qcol = GLRenderer::getMainColor();
 				else
-					qcol = getColor (topobj->color())->faceColor;
+					qcol = topobj->color()->faceColor();
 			}
-			elif (poly.color == edgecolor)
+			elif (poly.color == edgeColorIndex)
 			{
 				qcol = luma (QColor (cfg::backgroundColor)) > 40 ? Qt::black : Qt::white;
 			}
 			else
 			{
-				LDColor* col = getColor (poly.color);
+				LDColor col = LDColor::fromIndex (poly.color);
 
 				if (col)
-					qcol = col->faceColor;
+					qcol = col->faceColor();
 			}
 			break;
 	}