diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 20:54:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-19 20:54:53 +0400 |
| commit | eee22fe2f60b5240b7f4a4a530bbfb8a871cd144 (patch) | |
| tree | 9127107a253252f705f227d088a2f67c58a8058e /source/blender/editors | |
| parent | a006b98c6cebcd2b45f71a95eca244847b5fd9a9 (diff) | |
rebane files to match trunk.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/include/ED_mesh.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_add.c (renamed from source/blender/editors/mesh/editbmesh_add.c) | 0 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_bvh.c (renamed from source/blender/editors/mesh/editbmesh_bvh.c) | 0 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_bvh.h (renamed from source/blender/editors/mesh/editbmesh_bvh.h) | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index 1b9dcaa09bc..dc9011b5d46 100644 --- 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 */ diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index c57ef4f5690..f19f8972ace 100644 --- 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 ) diff --git a/source/blender/editors/mesh/editbmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index ce49d34ea1a..ce49d34ea1a 100644 --- a/source/blender/editors/mesh/editbmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c diff --git a/source/blender/editors/mesh/editbmesh_bvh.c b/source/blender/editors/mesh/editmesh_bvh.c index cc1f89e2c8b..cc1f89e2c8b 100644 --- a/source/blender/editors/mesh/editbmesh_bvh.c +++ b/source/blender/editors/mesh/editmesh_bvh.c diff --git a/source/blender/editors/mesh/editbmesh_bvh.h b/source/blender/editors/mesh/editmesh_bvh.h index e619d114d07..c8baa804205 100644 --- a/source/blender/editors/mesh/editbmesh_bvh.h +++ b/source/blender/editors/mesh/editmesh_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 */ |