building without python works again, cleanup bmesh include paths (cmake and scons).

26 files changed, 46 insertions, 112 deletions

diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt
index 0d39a99117c..446a6418431 100644
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -26,40 +26,11 @@
 
 set(INC 
 	.
-	intern
-	operators
-	../avi
-	../blenfont
 	../blenkernel
 	../blenlib
-	../blenloader
 	../editors/include
-	../editors/mesh
-	../gpu
-	../ikplugin
-	../imbuf
 	../makesdna
-	../makesrna
-	../modifiers
-	../nodes
-	../render/extern/include
-	../../../extern/glew/include
-	../../../intern/audaspace/intern
-	../../../intern/bsp/extern
-	../../../intern/decimation/extern
-	../../../intern/elbeem/extern
 	../../../intern/guardedalloc
-	../../../intern/iksolver/extern
-	../../../intern/memutil
-	../../../intern/mikktspace
-	../../../intern/opennl/extern
-	../../../intern/smoke/extern
-	# XXX - BAD LEVEL CALL WM_api.h
-	../../../source/blender/windowmanager
-)
-
-set(INC_SYS
-	${ZLIB_INCLUDE_DIRS}
 )
 
 set(SRC
@@ -121,22 +92,6 @@ set(SRC
 	bmesh_operator_api.h
 )
 
-add_definitions(-DGLEW_STATIC)
-
-if(WITH_LZO)
-	add_definitions(-DWITH_LZO)
-	list(APPEND INC_SYS
-		../../../extern/lzo/minilzo
-	)
-endif()
-
-if(WITH_LZMA)
-	add_definitions(-DWITH_LZMA)
-	list(APPEND INC_SYS
-		../../../extern/lzma
-	)
-endif()
-
 if(MSVC)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
 endif()
diff --git a/source/blender/bmesh/SConscript b/source/blender/bmesh/SConscript
index 76496dfdb7b..e545dd64b02 100644
--- a/source/blender/bmesh/SConscript
+++ b/source/blender/bmesh/SConscript
@@ -2,39 +2,19 @@
 Import ('env')
 
 cflags=''
-"""
-sources = ['intern/bmesh_eulers.c']
-sources.append('intern/bmesh_mesh.c')
-sources.append('intern/bmesh_polygon.c')
-sources.append('intern/bmesh_structure.c')
-sources.append('intern/bmesh_marking.c')
-
-sources.append('intern/bmesh_construct.c')
-sources.append('intern/bmesh_interp.c')
-sources.append('intern/bmesh_filters.c')
-sources.append('intern/bmesh_iterators.c')
-sources.append('intern/bmesh_mods.c')
-sources.append('intern/bmesh_queries.c')
-sources.append('intern/bmesh_operators.c')
-"""
-#sources.append('api/BME_walkers.c')
-
 
 sources = env.Glob('intern/*.c')
 sources += env.Glob('operators/*.c')
 
-#sources += env.Glob('tools/*.c')
-
-incs = ['#/intern/guardedalloc'] 
-incs.append('../blenlib') 
-incs.append('../blenloader') 
-incs.append('../makesdna')
-incs.append('../makesrna')
-incs.append('../blenkernel')
-incs.append('./')
-incs.append('./intern')
-incs.append('../editors/mesh')
-incs.append('../editors/include')
+incs = [
+	'#/intern/guardedalloc',
+	'../blenlib',
+	'../blenloader',
+	'../makesdna',
+	'../blenkernel',
+	'./',
+	'../editors/include',
+	]
 
 defs = []
 env.BlenderLib ( libname = 'bf_bmesh', sources = sources, includes = Split(incs), libtype = ['core','player'], defines=defs, priority=[100, 100], compileflags=cflags )
diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c
index b498fa73a73..9a7524ba73b 100644
--- a/source/blender/bmesh/intern/bmesh_construct.c
+++ b/source/blender/bmesh/intern/bmesh_construct.c
@@ -41,7 +41,7 @@
 #include "DNA_meshdata_types.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 #define SELECT 1
 
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index 6f2abcff5b0..16bc163ba34 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -35,7 +35,7 @@
 #include "BLI_array.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 /* use so valgrinds memcheck alerts us when undefined index is used.
  * TESTING ONLY! */
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c
index d2af98a5e9f..7963b6cf294 100644
--- a/source/blender/bmesh/intern/bmesh_interp.c
+++ b/source/blender/bmesh/intern/bmesh_interp.c
@@ -43,7 +43,7 @@
 #include "BLI_math.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 /**
  * \brief Data, Interp From Verts
diff --git a/source/blender/bmesh/intern/bmesh_iterators.c b/source/blender/bmesh/intern/bmesh_iterators.c
index 9694053e967..e58e989c41f 100644
--- a/source/blender/bmesh/intern/bmesh_iterators.c
+++ b/source/blender/bmesh/intern/bmesh_iterators.c
@@ -30,7 +30,7 @@
 
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 const char bm_iter_itype_htype_map[BM_ITYPE_MAX] = {
 	'\0',
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index ab8014ce25d..cf297560c32 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -41,7 +41,7 @@
 
 #include "ED_mesh.h"
 
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 /* used as an extern, defined in bmesh.h */
 BMAllocTemplate bm_mesh_allocsize_default = {512, 1024, 2048, 512};
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index dac95dfcfc0..b686a4b88e0 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -37,7 +37,7 @@
 #include "BKE_customdata.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 /**
  * \brief Dissolve Vert
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c
index e9c25fd4bbc..69e85fda002 100644
--- a/source/blender/bmesh/intern/bmesh_opdefines.c
+++ b/source/blender/bmesh/intern/bmesh_opdefines.c
@@ -55,7 +55,7 @@
  */
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 /* ok, I'm going to write a little docgen script. so all
  * bmop comments must conform to the following template/rules:
diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c
index a696808c133..166a3bca37a 100644
--- a/source/blender/bmesh/intern/bmesh_operators.c
+++ b/source/blender/bmesh/intern/bmesh_operators.c
@@ -37,7 +37,7 @@
 #include "BLI_array.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 /* forward declarations */
 static void bmo_flag_layer_alloc(BMesh *bm);
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c
index 09ca1024ce2..a3c791a6af9 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.c
+++ b/source/blender/bmesh/intern/bmesh_polygon.c
@@ -41,7 +41,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 /**
  * \brief TEST EDGE SIDE and POINT IN TRIANGLE
diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c
index 7211d080841..b80d6fe6e47 100644
--- a/source/blender/bmesh/intern/bmesh_queries.c
+++ b/source/blender/bmesh/intern/bmesh_queries.c
@@ -37,7 +37,7 @@
 #include "BLI_math.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 #define BM_OVERLAP (1 << 13)
 
diff --git a/source/blender/bmesh/intern/bmesh_structure.c b/source/blender/bmesh/intern/bmesh_structure.c
index 5b4a06e372a..fa6d9315fab 100644
--- a/source/blender/bmesh/intern/bmesh_structure.c
+++ b/source/blender/bmesh/intern/bmesh_structure.c
@@ -32,7 +32,7 @@
  */
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 #include <stdlib.h>
 
diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c
index c08a5440913..30bbc9e9b2a 100644
--- a/source/blender/bmesh/intern/bmesh_walkers_impl.c
+++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c
@@ -29,7 +29,7 @@
 #include "BKE_customdata.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 #include "bmesh_walkers_private.h"
 
 /**
diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c
index c54052e135e..3f17c7040b3 100644
--- a/source/blender/bmesh/operators/bmo_dissolve.c
+++ b/source/blender/bmesh/operators/bmo_dissolve.c
@@ -26,9 +26,9 @@
 #include "BLI_math.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
-#include "bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.h" /* own include */
 
 #define FACE_MARK	1
 #define FACE_ORIG	2
diff --git a/source/blender/bmesh/operators/bmo_edgesplit.c b/source/blender/bmesh/operators/bmo_edgesplit.c
index 8af80a184c0..c3501872979 100644
--- a/source/blender/bmesh/operators/bmo_edgesplit.c
+++ b/source/blender/bmesh/operators/bmo_edgesplit.c
@@ -28,7 +28,7 @@
 
 #include "bmesh.h"
 
-#include "bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.h" /* own include */
 
 typedef struct EdgeTag {
 	BMVert *newv1, *newv2;
diff --git a/source/blender/bmesh/operators/bmo_extrude.c b/source/blender/bmesh/operators/bmo_extrude.c
index ab5287a3d89..d62a22bcb8f 100644
--- a/source/blender/bmesh/operators/bmo_extrude.c
+++ b/source/blender/bmesh/operators/bmo_extrude.c
@@ -27,7 +27,7 @@
 
 #include "bmesh.h"
 
-#include "bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.h" /* own include */
 
 enum {
 	EXT_INPUT   = 1,
diff --git a/source/blender/bmesh/operators/bmo_join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c
index 3bb3f036990..1d8b77e9300 100644
--- a/source/blender/bmesh/operators/bmo_join_triangles.c
+++ b/source/blender/bmesh/operators/bmo_join_triangles.c
@@ -31,7 +31,7 @@
 
 #include "bmesh.h"
 
-#include "bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.h" /* own include */
 
 /*
  * JOIN_TRIANGLES.C
diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c
index ac8f7fc33ec..1f83a54e8f3 100644
--- a/source/blender/bmesh/operators/bmo_mesh_conv.c
+++ b/source/blender/bmesh/operators/bmo_mesh_conv.c
@@ -20,6 +20,14 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file blender/bmesh/operators/bmesh_mesh_conv.c
+ *  \ingroup bmesh
+ *
+ * This file contains functions
+ * for converting a Mesh
+ * into a Bmesh, and back again.
+ */
+
 #include "MEM_guardedalloc.h"
 
 #include "DNA_mesh_types.h"
@@ -39,18 +47,9 @@
 #include "BLI_array.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
-
-#include "bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_private.h"
 
-/*
- * MESH CONV.C
- *
- * This file contains functions
- * for converting a Mesh
- * into a Bmesh, and back again.
- *
- */
+#include "intern/bmesh_operators_private.h" /* own include */
 
 void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op)
 {
diff --git a/source/blender/bmesh/operators/bmo_mirror.c b/source/blender/bmesh/operators/bmo_mirror.c
index c21e7a26f4d..761222f8714 100644
--- a/source/blender/bmesh/operators/bmo_mirror.c
+++ b/source/blender/bmesh/operators/bmo_mirror.c
@@ -30,7 +30,7 @@
 #include "BKE_customdata.h"
 
 #include "bmesh.h"
-#include "bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.h" /* own include */
 
 #define ELE_NEW		1
 
diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c
index 54b0805df82..b0eb7b514de 100644
--- a/source/blender/bmesh/operators/bmo_primitive.c
+++ b/source/blender/bmesh/operators/bmo_primitive.c
@@ -27,7 +27,7 @@
 #include "ED_mesh.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 
 
diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c
index e7987164f6e..8d657e7b677 100644
--- a/source/blender/bmesh/operators/bmo_removedoubles.c
+++ b/source/blender/bmesh/operators/bmo_removedoubles.c
@@ -28,9 +28,9 @@
 #include "BKE_customdata.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
-#include "bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.h" /* own include */
 
 static void remdoubles_splitface(BMFace *f, BMesh *bm, BMOperator *op)
 {
diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c
index 95923e74042..9a6d9e7b836 100644
--- a/source/blender/bmesh/operators/bmo_subdivide.c
+++ b/source/blender/bmesh/operators/bmo_subdivide.c
@@ -34,9 +34,9 @@
 #include "ED_mesh.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
-#include "bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.h" /* own include */
 
 #include "bmo_subdivide.h" /* own include */
 
diff --git a/source/blender/bmesh/operators/bmo_triangulate.c b/source/blender/bmesh/operators/bmo_triangulate.c
index 63837b7e087..42e43494a74 100644
--- a/source/blender/bmesh/operators/bmo_triangulate.c
+++ b/source/blender/bmesh/operators/bmo_triangulate.c
@@ -28,9 +28,9 @@
 #include "BLI_smallhash.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
-#include "bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.h" /* own include */
 
 #define EDGE_NEW	1
 #define FACE_NEW	1
diff --git a/source/blender/bmesh/operators/bmo_utils.c b/source/blender/bmesh/operators/bmo_utils.c
index 9aed578dccc..198064d26dd 100644
--- a/source/blender/bmesh/operators/bmo_utils.c
+++ b/source/blender/bmesh/operators/bmo_utils.c
@@ -32,7 +32,7 @@
 
 #include "bmesh.h"
 
-#include "bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.h" /* own include */
 
 /*
  * UTILS.C
diff --git a/source/blender/bmesh/tools/BME_bevel.c b/source/blender/bmesh/tools/BME_bevel.c
index 8e697304cab..1bed4898166 100644
--- a/source/blender/bmesh/tools/BME_bevel.c
+++ b/source/blender/bmesh/tools/BME_bevel.c
@@ -42,7 +42,7 @@
 #include "BLI_memarena.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 /* BMESH_TODO
  *