- fix for python freeing its own bmesh clearing the global mirror cache.

- fix for own mistake (Ctrl+T didnt set beauty peroperty).
- remove bad level includes in bmesh.

7 files changed, 10 insertions, 17 deletions

diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt
index 016d2802094..1cf2b9113b2 100644
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -28,7 +28,6 @@ set(INC
 	.
 	../blenkernel
 	../blenlib
-	../editors/include
 	../makesdna
 	../../../intern/guardedalloc
 )
diff --git a/source/blender/bmesh/SConscript b/source/blender/bmesh/SConscript
index e06f43bd85d..fb00aef4d78 100644
--- a/source/blender/bmesh/SConscript
+++ b/source/blender/bmesh/SConscript
@@ -8,13 +8,11 @@ sources += env.Glob('operators/*.c')
 sources += env.Glob('tools/*.c')
 
 incs = [
-	'#/intern/guardedalloc',
+	'./',
 	'../blenlib',
-	'../blenloader',
 	'../makesdna',
 	'../blenkernel',
-	'./',
-	'../editors/include',
+	'#/intern/guardedalloc',
 	]
 
 defs = []
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index 6c208b46244..bd6eb7ae149 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -39,8 +39,6 @@
 #include "BKE_tessmesh.h"
 #include "BKE_multires.h"
 
-#include "ED_mesh.h"
-
 #include "intern/bmesh_private.h"
 
 /* used as an extern, defined in bmesh.h */
@@ -142,12 +140,6 @@ void BM_mesh_data_free(BMesh *bm)
 	BLI_mempool_destroy(bm->looplistpool);
 #endif
 
-	/* These tables aren't used yet, so it's not strictly necessary
-	 * to 'end' them (with 'e' param) but if someone tries to start
-	 * using them, having these in place will save a lot of pain */
-	mesh_octree_table(NULL, NULL, NULL, 'e');
-	mesh_mirrtopo_table(NULL, 'e');
-
 	BLI_freelistN(&bm->selected);
 
 	BMO_error_clear(bm);
diff --git a/source/blender/bmesh/intern/bmesh_operators.h b/source/blender/bmesh/intern/bmesh_operators.h
index 52e2018eeef..f4db13e2777 100644
--- a/source/blender/bmesh/intern/bmesh_operators.h
+++ b/source/blender/bmesh/intern/bmesh_operators.h
@@ -39,6 +39,13 @@ enum {
 	SUBD_STRAIGHT_CUT
 };
 
+enum {
+	SUBDIV_SELECT_ORIG,
+	SUBDIV_SELECT_INNER,
+	SUBDIV_SELECT_INNER_SEL,
+	SUBDIV_SELECT_LOOPCUT
+};
+
 /* similar face selection slot values */
 enum {
 	SIMFACE_MATERIAL = 201,
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c
index 2e41d4b923c..fbfc253c364 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.c
+++ b/source/blender/bmesh/intern/bmesh_polygon.c
@@ -445,6 +445,7 @@ void BM_face_normal_update_vcos(BMesh *bm, BMFace *f, float no[3],
 
 	/* must have valid index data */
 	BLI_assert((bm->elem_index_dirty & BM_VERT) == 0);
+	(void)bm;
 
 	/* common cases first */
 	switch (f->len) {
diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c
index fc0e34cf2f6..6fd3c8ce99c 100644
--- a/source/blender/bmesh/operators/bmo_primitive.c
+++ b/source/blender/bmesh/operators/bmo_primitive.c
@@ -28,8 +28,6 @@
 
 #include "BLI_math.h"
 
-#include "ED_mesh.h"
-
 #include "bmesh.h"
 #include "intern/bmesh_private.h"
 
diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c
index 2f198992eb6..d5f46ebfc85 100644
--- a/source/blender/bmesh/operators/bmo_subdivide.c
+++ b/source/blender/bmesh/operators/bmo_subdivide.c
@@ -35,8 +35,6 @@
 
 #include "DNA_object_types.h"
 
-#include "ED_mesh.h"
-
 #include "bmesh.h"
 #include "intern/bmesh_private.h"