svn merge -r40166:40279 ^/trunk/blender
[blender.git] / source / blender / blenkernel / intern / subsurf_ccg.c
index 74c4812..b262815 100644 (file)
@@ -65,8 +65,7 @@
 #include "PIL_time.h"
 #include "BLI_array.h"
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
+#include "GL/glew.h"
 
 #include "GPU_draw.h"
 #include "GPU_extensions.h"
@@ -74,6 +73,8 @@
 
 #include "CCGSubSurf.h"
 
+extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */
+
 static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
                                          int drawInteriorEdges,
                                          int useSubsurfUv,