code cleanup,

- bmesh_newcore.c -> bmesh_core.c.
- add bmesh_interp header.

3 files changed, 12 insertions, 19 deletions

diff --git a/source/blender/bmesh/intern/bmesh_newcore.c b/source/blender/bmesh/intern/bmesh_core.c
index 8b1693cba95..8b1693cba95 100644
--- a/source/blender/bmesh/intern/bmesh_newcore.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
diff --git a/source/blender/bmesh/intern/bmesh_private.h b/source/blender/bmesh/intern/bmesh_private.h
index 7147f20013b..5b42788fe88 100644
--- a/source/blender/bmesh/intern/bmesh_private.h
+++ b/source/blender/bmesh/intern/bmesh_private.h
@@ -40,14 +40,14 @@
 int bmesh_elem_check(BMesh *bm, void *element, const char htype);
 
 #define BM_CHECK_ELEMENT(bm, el)                                              \
-    if (bmesh_elem_check(bm, el, ((BMHeader *)el)->htype)) {               \
+    if (bmesh_elem_check(bm, el, ((BMHeader *)el)->htype)) {                  \
         printf("check_element failure, with code %i on line %i in file\n"     \
         "    \"%s\"\n\n",                                                     \
-        bmesh_elem_check(bm, el, ((BMHeader *)el)->htype),                 \
+        bmesh_elem_check(bm, el, ((BMHeader *)el)->htype),                    \
         __LINE__, __FILE__);                                                  \
     }
 
-#define BM_EDGE_DISK_LINK_GET(e, v)  (                                        \
+#define BM_DISK_EDGE_LINK_GET(e, v)  (                                        \
 	((v) == ((BMEdge *)(e))->v1) ?                                            \
 		&((e)->v1_disk_link) :                                                \
 		&((e)->v2_disk_link)                                                  \
@@ -56,13 +56,6 @@ int bmesh_elem_check(BMesh *bm, void *element, const char htype);
 int bmesh_radial_length(BMLoop *l);
 int bmesh_disk_count(BMVert *v);
 
-/* internal selection flushing */
-void bmesh_selectmode_flush(BMesh *bm);
-
-/*internal filter API*/
-void *bmesh_get_filter_callback(int type);
-int bmesh_get_filter_argtype(int type);
-
 /* NOTE: ensure different parts of the API do not conflict
  * on using these internal flags!*/
 #define _FLAG_JF	1 /* join faces */
diff --git a/source/blender/bmesh/intern/bmesh_structure.c b/source/blender/bmesh/intern/bmesh_structure.c
index 5dd2537400a..8dc6a5c6029 100644
--- a/source/blender/bmesh/intern/bmesh_structure.c
+++ b/source/blender/bmesh/intern/bmesh_structure.c
@@ -153,7 +153,7 @@ int bmesh_edge_swapverts(BMEdge *e, BMVert *orig, BMVert *newv)
 int bmesh_disk_edge_append(struct BMEdge *e, struct BMVert *v)
 {
 	if (!v->e) {
-		BMDiskLink *dl1 = BM_EDGE_DISK_LINK_GET(e, v);
+		BMDiskLink *dl1 = BM_DISK_EDGE_LINK_GET(e, v);
 
 		v->e = e;
 		dl1->next = dl1->prev = e;
@@ -161,9 +161,9 @@ int bmesh_disk_edge_append(struct BMEdge *e, struct BMVert *v)
 	else {
 		BMDiskLink *dl1, *dl2, *dl3;
 
-		dl1 = BM_EDGE_DISK_LINK_GET(e, v);
-		dl2 = BM_EDGE_DISK_LINK_GET(v->e, v);
-		dl3 = dl2->prev ? BM_EDGE_DISK_LINK_GET(dl2->prev, v) : NULL;
+		dl1 = BM_DISK_EDGE_LINK_GET(e, v);
+		dl2 = BM_DISK_EDGE_LINK_GET(v->e, v);
+		dl3 = dl2->prev ? BM_DISK_EDGE_LINK_GET(dl2->prev, v) : NULL;
 
 		dl1->next = v->e;
 		dl1->prev = dl2->prev;
@@ -180,14 +180,14 @@ void bmesh_disk_edge_remove(struct BMEdge *e, struct BMVert *v)
 {
 	BMDiskLink *dl1, *dl2;
 
-	dl1 = BM_EDGE_DISK_LINK_GET(e, v);
+	dl1 = BM_DISK_EDGE_LINK_GET(e, v);
 	if (dl1->prev) {
-		dl2 = BM_EDGE_DISK_LINK_GET(dl1->prev, v);
+		dl2 = BM_DISK_EDGE_LINK_GET(dl1->prev, v);
 		dl2->next = dl1->next;
 	}
 
 	if (dl1->next) {
-		dl2 = BM_EDGE_DISK_LINK_GET(dl1->next, v);
+		dl2 = BM_DISK_EDGE_LINK_GET(dl1->next, v);
 		dl2->prev = dl1->prev;
 	}
 
@@ -215,7 +215,7 @@ struct BMEdge *bmesh_disk_edge_next(struct BMEdge *e, struct BMVert *v)
 	return NULL;
 }
 
-static BMEdge *bmesh_disk_prevedge(BMEdge *e, BMVert *v)
+static BMEdge *bmesh_disk_edge_prev(BMEdge *e, BMVert *v)
 {
 	if (v == e->v1)
 		return e->v1_disk_link.prev;
@@ -278,7 +278,7 @@ int bmesh_disk_validate(int len, BMEdge *e, BMVert *v)
 
 	e_iter = e;
 	do {
-		if (len != 1 && bmesh_disk_prevedge(e_iter, v) == e_iter) {
+		if (len != 1 && bmesh_disk_edge_prev(e_iter, v) == e_iter) {
 			return FALSE;
 		}
 	} while ((e_iter = bmesh_disk_edge_next(e_iter, v)) != e);