Mercurial > ldforge / file diff

--- a/src/gldraw.cpp	Sun Jul 07 23:43:43 2013 +0300
+++ b/src/gldraw.cpp	Mon Jul 08 01:29:28 2013 +0300
@@ -261,14 +261,16 @@
 			qcol = getMainColor ();
 		else {
 			color* col = getColor (obj->color ());
-			qcol = col->faceColor;
+			
+			if( col )
+				qcol = col->faceColor;
 		}
 		
 		if (obj->color () == edgecolor) {
 			qcol = luma (m_bgcolor) < 40 ? QColor (64, 64, 64) : Qt::black;
 			color* col;
 			
-			if (!gl_blackedges && obj->parent () != null && (col = getColor (obj->parent ()->color ())) != null)
+			if (!gl_blackedges && obj->parent () && (col = getColor (obj->parent ()->color ())))
 				qcol = col->edgeColor;
 		}