[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40293] branches/bmesh/blender/source/ blender/blenkernel/intern/editderivedbmesh.c: fix for building after merge

Campbell Barton ideasman42 at gmail.com
Sat Sep 17 14:25:52 CEST 2011


Revision: 40293
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40293
Author:   campbellbarton
Date:     2011-09-17 12:25:51 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
fix for building after merge

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c	2011-09-17 10:45:20 UTC (rev 40292)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c	2011-09-17 12:25:51 UTC (rev 40293)
@@ -83,8 +83,7 @@
 
 #include "BLO_sys_types.h" // for intptr_t support
 
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
+#include "GL/glew.h"
 
 #include "GPU_draw.h"
 #include "GPU_extensions.h"
@@ -92,6 +91,9 @@
 
 #include "bmesh.h"
 
+extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */
+
+
 BMEditMesh *BMEdit_Create(BMesh *bm)
 {
 	BMEditMesh *tm = MEM_callocN(sizeof(BMEditMesh), __func__);




More information about the Bf-blender-cvs mailing list