[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24290] branches/bmesh/blender/source/ blender/editors/mesh: compile fix

[Joseph Eagar]

Revision: 24290
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24290
Author:   joeedh
Date:     2009-11-04 03:12:00 +0100 (Wed, 04 Nov 2009)

Log Message:
-----------
compile fix

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c
    branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.h

Modified: branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c	2009-11-04 00:21:25 UTC (rev 24289)
+++ branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c	2009-11-04 02:12:00 UTC (rev 24290)
@@ -90,6 +90,7 @@
 #include "mesh_intern.h"
 #include "bmesh.h"
 
+#define IN_EDITMESHBVH
 #include "editbmesh_bvh.h"
 
 typedef struct BMBVHTree {

Modified: branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.h	2009-11-04 00:21:25 UTC (rev 24289)
+++ branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.h	2009-11-04 02:12:00 UTC (rev 24290)
@@ -3,13 +3,15 @@
 struct BMEdge;
 struct BMVert;
 struct RegionView3D;
+struct BMBVHTree;
 
-struct BMBVHTree;
+#ifndef IN_EDITMESHBVH
 typedef struct BMBVHTree BMBVHTree;
+#endif
 
-BMBVHTree *BMBVH_NewBVH(struct BMEditMesh *em);
-void BMBVH_FreeBVH(BMBVHTree *tree);
+struct BMBVHTree *BMBVH_NewBVH(struct BMEditMesh *em);
+void BMBVH_FreeBVH(struct BMBVHTree *tree);
 
-struct BMFace *BMBVH_RayCast(BMBVHTree *tree, float *co, float *dir, float *hitout);
-int BMBVH_EdgeVisible(BMBVHTree *tree, struct BMEdge *e, 
+struct BMFace *BMBVH_RayCast(struct BMBVHTree *tree, float *co, float *dir, float *hitout);
+int BMBVH_EdgeVisible(struct BMBVHTree *tree, struct BMEdge *e, 
                       struct RegionView3D *r3d, struct Object *obedit);