Revision: 44727
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44727
Author: campbellbarton
Date: 2012-03-08 03:25:53 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
building without python works again, cleanup bmesh include paths (cmake and
scons).
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/source/blender/blenkernel/BKE_multires.h
trunk/blender/source/blender/blenkernel/BKE_sequencer.h
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/bmesh/CMakeLists.txt
trunk/blender/source/blender/bmesh/SConscript
trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
trunk/blender/source/blender/bmesh/intern/bmesh_iterators.c
trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/bmesh/intern/bmesh_structure.c
trunk/blender/source/blender/bmesh/intern/bmesh_walkers_impl.c
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/bmesh/operators/bmo_edgesplit.c
trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c
trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
trunk/blender/source/blender/bmesh/operators/bmo_mirror.c
trunk/blender/source/blender/bmesh/operators/bmo_primitive.c
trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
trunk/blender/source/blender/bmesh/operators/bmo_utils.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/makesrna/intern/rna_screen.c
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2012-03-08 03:05:57 UTC (rev 44726)
+++ trunk/blender/SConstruct 2012-03-08 03:25:53 UTC (rev 44727)
@@ -266,6 +266,7 @@
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():
Modified: trunk/blender/source/blender/blenkernel/BKE_multires.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_multires.h 2012-03-08
03:05:57 UTC (rev 44726)
+++ trunk/blender/source/blender/blenkernel/BKE_multires.h 2012-03-08
03:25:53 UTC (rev 44727)
@@ -75,7 +75,7 @@
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);
Modified: trunk/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2012-03-08
03:05:57 UTC (rev 44726)
+++ trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2012-03-08
03:25:53 UTC (rev 44727)
@@ -101,8 +101,14 @@
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 {
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2012-03-08
03:05:57 UTC (rev 44726)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2012-03-08
03:25:53 UTC (rev 44727)
@@ -85,8 +85,8 @@
intern/depsgraph.c
intern/displist.c
intern/dynamicpaint.c
+ intern/editderivedmesh.c
intern/effect.c
- intern/editderivedmesh.c
intern/fcurve.c
intern/fluidsim.c
intern/fmodifier.c
@@ -114,8 +114,8 @@
intern/multires.c
intern/nla.c
intern/node.c
+ intern/object.c
intern/ocean.c
- intern/object.c
intern/packedFile.c
intern/paint.c
intern/particle.c
@@ -200,8 +200,8 @@
BKE_multires.h
BKE_nla.h
BKE_node.h
+ BKE_object.h
BKE_ocean.h
- BKE_object.h
BKE_packedFile.h
BKE_paint.h
BKE_particle.h
@@ -233,8 +233,8 @@
BKE_writeffmpeg.h
BKE_writeframeserver.h
depsgraph_private.h
+ nla_private.h
intern/CCGSubSurf.h
- nla_private.h
)
add_definitions(-DGLEW_STATIC)
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-03-08
03:05:57 UTC (rev 44726)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-03-08
03:25:53 UTC (rev 44727)
@@ -172,6 +172,13 @@
}
}
+#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);
Modified: trunk/blender/source/blender/bmesh/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/bmesh/CMakeLists.txt 2012-03-08 03:05:57 UTC
(rev 44726)
+++ trunk/blender/source/blender/bmesh/CMakeLists.txt 2012-03-08 03:25:53 UTC
(rev 44727)
@@ -26,42 +26,13 @@
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
operators/bmo_bevel.c
operators/bmo_connect.c
@@ -121,22 +92,6 @@
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()
Modified: trunk/blender/source/blender/bmesh/SConscript
===================================================================
--- trunk/blender/source/blender/bmesh/SConscript 2012-03-08 03:05:57 UTC
(rev 44726)
+++ trunk/blender/source/blender/bmesh/SConscript 2012-03-08 03:25:53 UTC
(rev 44727)
@@ -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',
+ '../blenlib',
+ '../blenloader',
+ '../makesdna',
+ '../blenkernel',
+ './',
+ '../editors/include',
+ ]
-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')
-
defs = []
env.BlenderLib ( libname = 'bf_bmesh', sources = sources, includes =
Split(incs), libtype = ['core','player'], defines=defs, priority=[100, 100],
compileflags=cflags )
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-03-08
03:05:57 UTC (rev 44726)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-03-08
03:25:53 UTC (rev 44727)
@@ -41,7 +41,7 @@
#include "DNA_meshdata_types.h"
#include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
#define SELECT 1
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-03-08
03:05:57 UTC (rev 44726)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2012-03-08
03:25:53 UTC (rev 44727)
@@ -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! */
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-03-08
03:05:57 UTC (rev 44726)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-03-08
03:25:53 UTC (rev 44727)
@@ -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
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_iterators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_iterators.c 2012-03-08
03:05:57 UTC (rev 44726)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_iterators.c 2012-03-08
03:25:53 UTC (rev 44727)
@@ -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',
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-03-08
03:05:57 UTC (rev 44726)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-03-08
03:25:53 UTC (rev 44727)
@@ -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};
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-03-08
03:05:57 UTC (rev 44726)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-03-08
03:25:53 UTC (rev 44727)
@@ -37,7 +37,7 @@
#include "BKE_customdata.h"
#include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
/**
* \brief Dissolve Vert
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c 2012-03-08
03:05:57 UTC (rev 44726)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_opdefines.c 2012-03-08
03:25:53 UTC (rev 44727)
@@ -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:
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-03-08
03:05:57 UTC (rev 44726)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-03-08
03:25:53 UTC (rev 44727)
@@ -37,7 +37,7 @@
#include "BLI_array.h"
#include "bmesh.h"
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
