Mercurial > ldforge / file diff

--- a/src/glRenderer.cpp	Tue Sep 22 23:38:19 2015 +0300
+++ b/src/glRenderer.cpp	Sun Oct 04 02:52:03 2015 +0300
@@ -40,6 +40,7 @@
 #include "messageLog.h"
 #include "glCompiler.h"
 #include "primitives.h"
+#include "documentmanager.h"
 
 const LDFixedCamera g_FixedCameras[6] =
 {
@@ -336,7 +337,7 @@
 		return;
 
 	color.setAlpha (255);
-	m_useDarkBackground = Luma (color) < 80;
+	m_useDarkBackground = luma (color) < 80;
 	m_backgroundColor = color;
 	qglClearColor (color);
 }
@@ -607,7 +608,7 @@
 {
 	QPen linepen (m_thinBorderPen);
 	linepen.setWidth (2);
-	linepen.setColor (Luma (m_backgroundColor) < 40 ? Qt::white : Qt::black);
+	linepen.setColor (luma (m_backgroundColor) < 40 ? Qt::white : Qt::black);
 	return linepen;
 }
 
@@ -1581,7 +1582,7 @@
 		QString primitiveName = item->primitive()->name;
 		LDSubfile* ref = LDSpawn<LDSubfile>();
 		ref->setColor (MainColor);
-		ref->setFileInfo (GetDocument (primitiveName));
+		ref->setFileInfo (m_documents->getDocumentByName (primitiveName));
 		ref->setPosition (Origin);
 		ref->setTransform (IdentityMatrix);
 		currentDocument()->insertObj (m_window->suggestInsertPoint(), ref);