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

SConstruct

@@ -266,6 +266,7 @@ if 'blenderlite' in B.targets:
     target_env_defs['WITH_BF_REMESH'] = False
     target_env_defs['WITH_BF_PYTHON'] = False
     target_env_defs['WITH_BF_3DMOUSE'] = False
+    target_env_defs['WITH_BF_LIBMV'] = False
     
     # Merge blenderlite, let command line to override
     for k,v in target_env_defs.iteritems():

source/blender/blenkernel/BKE_multires.h

@@ -75,7 +75,7 @@ void multires_stitch_grids(struct Object *);
 enum {
 	MULTIRES_SPACE_TANGENT,
 	MULTIRES_SPACE_OBJECT,
-	MULTIRES_SPACE_ABSOLUTE,
+	MULTIRES_SPACE_ABSOLUTE
 };
 void multires_set_space(struct DerivedMesh *dm, struct Object *ob, int from, int to);
 

source/blender/blenkernel/BKE_sequencer.h

@@ -101,8 +101,14 @@ int seq_cmp_render_data(const SeqRenderData * a, const SeqRenderData * b);
 unsigned int seq_hash_render_data(const SeqRenderData * a);
 
 /* Wipe effect */
-enum {DO_SINGLE_WIPE, DO_DOUBLE_WIPE, DO_BOX_WIPE, DO_CROSS_WIPE,
-	DO_IRIS_WIPE,DO_CLOCK_WIPE};
+enum {
+	DO_SINGLE_WIPE,
+	DO_DOUBLE_WIPE,
+	DO_BOX_WIPE,
+	DO_CROSS_WIPE,
+	DO_IRIS_WIPE,
+	DO_CLOCK_WIPE
+};
 
 
 struct SeqEffectHandle {

source/blender/blenkernel/CMakeLists.txt

@@ -85,8 +85,8 @@ set(SRC
 	intern/depsgraph.c
 	intern/displist.c
 	intern/dynamicpaint.c
-	intern/effect.c
 	intern/editderivedmesh.c
+	intern/effect.c
 	intern/fcurve.c
 	intern/fluidsim.c
 	intern/fmodifier.c
@@ -114,8 +114,8 @@ set(SRC
 	intern/multires.c
 	intern/nla.c
 	intern/node.c
-	intern/ocean.c
 	intern/object.c
+	intern/ocean.c
 	intern/packedFile.c
 	intern/paint.c
 	intern/particle.c
@@ -200,8 +200,8 @@ set(SRC
 	BKE_multires.h
 	BKE_nla.h
 	BKE_node.h
-	BKE_ocean.h
 	BKE_object.h
+	BKE_ocean.h
 	BKE_packedFile.h
 	BKE_paint.h
 	BKE_particle.h
@@ -233,8 +233,8 @@ set(SRC
 	BKE_writeffmpeg.h
 	BKE_writeframeserver.h
 	depsgraph_private.h
-	intern/CCGSubSurf.h
 	nla_private.h
+	intern/CCGSubSurf.h
 )
 
 add_definitions(-DGLEW_STATIC)

source/blender/blenkernel/intern/customdata.c

@@ -172,6 +172,13 @@ static void layerCopy_bmesh_elem_py_ptr(const void *UNUSED(source), void *dest,
 	}
 }
 
+#ifndef WITH_PYTHON
+void bpy_bm_generic_invalidate(void *UNUSED(self))
+{
+	/* dummy */
+}
+#endif
+
 static void layerFree_bmesh_elem_py_ptr(void *data, int count, int size)
 {
 	extern void bpy_bm_generic_invalidate(void *self);

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()

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 )

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
 

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! */

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

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',

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};

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

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:

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);

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

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)
 

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>
 

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"
 
 /**

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

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;

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,

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

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 "intern/bmesh_private.h"
 
-#include "bmesh_operators_private.h" /* own include */
-
-/*
- * 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)
 {

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
 

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"
 
 
 

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)
 {

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 */
 

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

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

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
  *

source/blender/editors/interface/interface.c

@@ -1745,9 +1745,12 @@ int ui_set_but_string_eval_num(bContext *C, uiBut *but, const char *str, double
 
 #else /* WITH_PYTHON */
 
-	value= atof(str);
+	*value = atof(str);
 	ok = TRUE;
 
+	(void)C;
+	(void)but;
+
 #endif /* WITH_PYTHON */
 
 	return ok;

source/blender/makesrna/intern/rna_screen.c

@@ -82,9 +82,9 @@ static void rna_Screen_scene_update(bContext *C, PointerRNA *ptr)
 	}
 }
 
-static void rna_Screen_redraw_update(Main *bmain, Scene *scene, PointerRNA *ptr)
+static void rna_Screen_redraw_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	bScreen *screen = (bScreen*)ptr->data;
+	bScreen *screen = (bScreen *)ptr->data;
 
 	/* the settings for this are currently only available from a menu in the TimeLine, hence refresh=SPACE_TIME */
 	ED_screen_animation_timer_update(screen, screen->redraws_flag, SPACE_TIME);