rebane files to match trunk.

2012-02-19 16:54:53 +00:00 · 2012-02-19 16:54:53 +00:00 · eee22fe2f6
parent a006b98c6c
commit eee22fe2f6
5 changed files with 5 additions and 5 deletions
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@ -310,7 +310,7 @@ int ED_mesh_color_remove_named(struct bContext *C, struct Object *ob, struct Mes
 void EDBM_selectmode_to_scene(struct bContext *C);
 void EDBM_ClearMesh(struct BMEditMesh *em);

-#include "../mesh/editbmesh_bvh.h"
+#include "../mesh/editmesh_bvh.h"


 /* mirrtopo */
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@ -41,8 +41,8 @@ set(SRC
 	meshtools.c
 	loopcut.c
 	mesh_ops.c
-	editbmesh_bvh.c
-	editbmesh_add.c
+	editmesh_bvh.c
+	editmesh_add.c
 	bmeshutils.c
 	bmesh_selecthistory.c
 	bmesh_select.c
@ -51,7 +51,7 @@ set(SRC
 	knifetool.c
 	editface.c

-	editbmesh_bvh.h
+	editmesh_bvh.h
 	mesh_intern.h
 )

--- a/source/blender/editors/mesh/editbmesh_add.c
+++ b/source/blender/editors/mesh/editbmesh_add.c
--- a/source/blender/editors/mesh/editbmesh_bvh.c
+++ b/source/blender/editors/mesh/editbmesh_bvh.c
--- a/source/blender/editors/mesh/editbmesh_bvh.h
+++ b/source/blender/editors/mesh/editbmesh_bvh.h
@ -25,7 +25,7 @@
 * ***** END GPL LICENSE BLOCK *****
 */

-/** \file blender/editors/mesh/editbmesh_bvh.h
+/** \file blender/editors/mesh/editmesh_bvh.h
 *  \ingroup edmesh
 */