[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21644] branches/bmesh/blender/source/ blender/bmesh: another attempt to hopefully fix gcc compiling

[Joseph Eagar]

Revision: 21644
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21644
Author:   joeedh
Date:     2009-07-17 03:43:01 +0200 (Fri, 17 Jul 2009)

Log Message:
-----------
another attempt to hopefully fix gcc compiling

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/bmesh.h
    branches/bmesh/blender/source/blender/bmesh/bmesh_queries.h

Modified: branches/bmesh/blender/source/blender/bmesh/bmesh.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh.h	2009-07-17 01:36:21 UTC (rev 21643)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh.h	2009-07-17 01:43:01 UTC (rev 21644)
@@ -39,6 +39,10 @@
 
 #include "DNA_listBase.h"
 #include "DNA_scene_types.h"
+#include "DNA_customdata_types.h"
+
+#include "BKE_customdata.h"
+
 #include "BLI_mempool.h"
 
 /*
@@ -65,6 +69,7 @@
 */
 
 /*forward declarations*/
+struct BMesh;
 struct BMVert;
 struct BMEdge;
 struct BMFace;
@@ -73,9 +78,6 @@
 struct Mesh;
 struct EditMesh;
 
-#include "BKE_customdata.h"
-#include "DNA_customdata_types.h"
-
 /*
  * BMHeader
  *

Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_queries.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_queries.h	2009-07-17 01:36:21 UTC (rev 21643)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_queries.h	2009-07-17 01:43:01 UTC (rev 21644)
@@ -14,9 +14,8 @@
 
 int BM_Edge_In_Face(struct BMFace *f, struct BMEdge *e);
 
-int BM_Vert_In_Edge(struct BMVert *v1, struct BMVert *v2, BMEdge *e);
+int BM_Vert_In_Edge(struct BMEdge *e, struct BMVert *v);
 
-
 /*get opposing vert from v in edge e.*/
 struct BMVert *BM_OtherEdgeVert(struct BMEdge *e, struct BMVert *v);