Mercurial > ldforge2 / file diff

--- a/src/gl/compiler.h	Tue Jan 28 23:34:49 2020 +0200
+++ b/src/gl/compiler.h	Thu Jan 30 19:20:11 2020 +0200
@@ -46,7 +46,7 @@
 {
 	Q_OBJECT
 public:
-	Compiler(const ColorTable& colorTable, QObject* parent);
+	Compiler(const ldraw::ColorTable& colorTable, QObject* parent);
 	~Compiler();
 	void build(Model* model, DocumentManager* context);
 	void buildPolygon(Polygon polygon, std::vector<Vertex>* vboData);
@@ -83,7 +83,7 @@
 	std::size_t storedVertexCounts[gl::NUM_ARRAY_CLASSES] = {0_z};
 	bool initialized = false;
 	BoundingBox boundingBox;
-	const ColorTable& colorTable;
+	const ldraw::ColorTable& colorTable;
 	struct
 	{
 		QOpenGLShaderProgram* program = nullptr;