Mercurial > ldforge / file diff

--- a/src/gldraw.h	Tue Jan 21 01:09:22 2014 +0200
+++ b/src/gldraw.h	Tue Jan 21 01:29:12 2014 +0200
@@ -23,6 +23,7 @@
 #include "main.h"
 #include "ldtypes.h"
 #include "document.h"
+#include "GLShared.h"
 
 class MessageManager;
 class QDialogButtonBox;
@@ -115,17 +116,6 @@
 			BFCBackList
 		};
 
-		enum VAOType
-		{
-			ESurfaceArray,
-			EEdgeArray,
-			ECondEdgeArray,
-			EBFCArray,
-			EPickArray,
-			EEdgePickArray,
-			ENumArrays
-		};
-
 		// CameraIcon::img is a heap-allocated QPixmap because otherwise it gets
 		// initialized before program gets to main() and constructs a QApplication
 		// and Qt doesn't like that.
@@ -257,7 +247,7 @@
 		Vertex         coordconv2_3 (const QPoint& pos2d, bool snap) const;
 
 		// Draw a VAO array
-		void           drawVAOs (VAOType arrayType, GLenum type);
+		void           drawVAOs (E_VertexArrayType arrayType, GLenum type);
 
 		// Determine which color to draw text with
 		QColor         getTextPen() const;