style cleanup for bmesh headers

- use consistant header guards
- correct doxy comments
- remove ED_toolmode.h (unused)

3 files changed, 3 insertions, 82 deletions

diff --git a/source/blender/editors/include/ED_toolmode.h b/source/blender/editors/include/ED_toolmode.h
deleted file mode 100755
index 981fcd31e2d..00000000000
--- a/source/blender/editors/include/ED_toolmode.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#if 0
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2008 Blender Foundation.
- * All rights reserved.
- *
- * Contributor(s): Joseph Eagar
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-#ifndef ED_TOOLMODE_H
-#define ED_TOOLMODE_H
-
-struct ID;
-struct View3D;
-struct ARegion;
-struct bContext;
-struct wmWindowManager;
-struct wmKeyConfig;
-struct ReportList;
-struct ViewContext;
-struct bDeformGroup;
-struct MDeformWeight;
-struct MDeformVert;
-struct Scene;
-struct Mesh;
-struct MCol;
-struct UvVertMap;
-struct UvMapVert;
-struct CustomData;
-struct BMEditMesh;
-struct BMEditSelection;
-struct BMesh;
-struct BMVert;
-struct BMEdge;
-struct BMFace;
-struct UvVertMap;
-struct UvMapVert;
-struct Material;
-struct Object;
-struct rcti;
-struct wmOperator;
-
-typedef struct ToolModeDefine {
-	short idtype, icon;
-	char *name;
-	void (*create)(void *args);
-	void (*free)(void *self);
-	
-	/*called when mode is set active*/
-	void (*enter)(void *self, struct bContext *C);
-	void (*exit)(void *self, struct bContext *C);
-	
-	/*called on draw*/
-	void (*draw)(void *self, struct bContext *C);
-	/*modal is option, and should be used carefully*/
-	void (*modal)(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
-	
-	/*keymap stuff*/	
-	void (*create_keymap)(struct wmKeyConfig *km);
-	void (*keymap_poll)(struct bContext *C);
-};
-#endif
diff --git a/source/blender/editors/mesh/editbmesh_bvh.h b/source/blender/editors/mesh/editbmesh_bvh.h
index 0eca374ab04..e619d114d07 100644
--- a/source/blender/editors/mesh/editbmesh_bvh.h
+++ b/source/blender/editors/mesh/editbmesh_bvh.h
@@ -29,8 +29,8 @@
  *  \ingroup edmesh
  */
 
-#ifndef _EDITBMESH_BVH
-#define _EDITBMESH_BVH
+#ifndef __EDITBMESH_BVH_H__
+#define __EDITBMESH_BVH_H__
 
 struct BMEditMesh;
 struct BMFace;
@@ -64,4 +64,4 @@ struct BMVert *BMBVH_FindClosestVert(struct BMBVHTree *tree, float *co, float ma
 #define BMBVH_USE_CAGE		1 /*project geometry onto modifier cage */
 #define BMBVH_RETURN_ORIG	2 /*use with BMBVH_USE_CAGE, returns hits in relation to original geometry*/
 
-#endif /* _EDITBMESH_H */
+#endif /* __EDITBMESH_BVH_H__ */
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index e56d5802e1f..eb0286716f3 100644
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -76,7 +76,6 @@ set(SRC
 	../include/ED_sound.h
 	../include/ED_space_api.h
 	../include/ED_text.h
-	../include/ED_toolmode.h
 	../include/ED_transform.h
 	../include/ED_types.h
 	../include/ED_util.h