building without python works again, cleanup bmesh include paths (cmake and scons).
authorCampbell Barton <ideasman42@gmail.com>
Thu, 8 Mar 2012 03:25:53 +0000 (03:25 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 8 Mar 2012 03:25:53 +0000 (03:25 +0000)
33 files changed:
SConstruct
source/blender/blenkernel/BKE_multires.h
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/customdata.c
source/blender/bmesh/CMakeLists.txt
source/blender/bmesh/SConscript
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_core.c
source/blender/bmesh/intern/bmesh_interp.c
source/blender/bmesh/intern/bmesh_iterators.c
source/blender/bmesh/intern/bmesh_mesh.c
source/blender/bmesh/intern/bmesh_mods.c
source/blender/bmesh/intern/bmesh_opdefines.c
source/blender/bmesh/intern/bmesh_operators.c
source/blender/bmesh/intern/bmesh_polygon.c
source/blender/bmesh/intern/bmesh_queries.c
source/blender/bmesh/intern/bmesh_structure.c
source/blender/bmesh/intern/bmesh_walkers_impl.c
source/blender/bmesh/operators/bmo_dissolve.c
source/blender/bmesh/operators/bmo_edgesplit.c
source/blender/bmesh/operators/bmo_extrude.c
source/blender/bmesh/operators/bmo_join_triangles.c
source/blender/bmesh/operators/bmo_mesh_conv.c
source/blender/bmesh/operators/bmo_mirror.c
source/blender/bmesh/operators/bmo_primitive.c
source/blender/bmesh/operators/bmo_removedoubles.c
source/blender/bmesh/operators/bmo_subdivide.c
source/blender/bmesh/operators/bmo_triangulate.c
source/blender/bmesh/operators/bmo_utils.c
source/blender/bmesh/tools/BME_bevel.c
source/blender/editors/interface/interface.c
source/blender/makesrna/intern/rna_screen.c

index 9a1f9234d0687c6d44b35c73e796aafcb6401c2a..ff668a974836cb7168cd3a277988cdc45f743601 100644 (file)
@@ -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():
index b1fa375388a4bd5128fe0175485784c3ae86ecc5..3412322986396e2fbd9eff68eaaf7aaf1202efba 100644 (file)
@@ -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);
 
index 3812d72d2c9a4bd7d22de6d6709347fa5995afd5..ab7e0e72191f05824a96f3ce4c88ffcc02a67435 100644 (file)
@@ -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 {
index 38946a465b6edce940532296c33539e48c3312f5..d777db7e0e72abf9daf7faba42599c3fc9cf00a0 100644 (file)
@@ -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)
index e3fcd39b391138f0eec1106b794f19616deb1a34..233d020254077339bf0af0119ffe6de656c1d595 100644 (file)
@@ -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);
index 0d39a99117cd914640b987aba6211fd535b070bc..446a641843139d36840f11c3f8d736f4ee6c7dbb 100644 (file)
 
 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()
index 76496dfdb7b16d9de5e5f8d8d9dce5a5659e37d0..e545dd64b0231fcc194ee55a48a685135c7a1d23 100644 (file)
@@ -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 )
index b498fa73a73c75dca29cae8c84500287405ab062..9a7524ba73b8b68f3735a64f9f443ac9d3101c0f 100644 (file)
@@ -41,7 +41,7 @@
 #include "DNA_meshdata_types.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 #define SELECT 1
 
index 6f2abcff5b068d0af2c53304d702458cee0c1b41..16bc163ba346ed7925476b09f750bf85fb05b1ff 100644 (file)
@@ -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! */
index d2af98a5e9f3be322761e48315bc92f3132f9edf..7963b6cf294cfa50cfeb647c4b745e15bd1781c5 100644 (file)
@@ -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
index 9694053e96737f43fa693383fe3066c99dd7af93..e58e989c41f0f113129c905a7746ce64c9e62a73 100644 (file)
@@ -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',
index ab8014ce25d054ccde635ca1b02224ff8b155870..cf297560c324a46322d1f7fe7241a948b4be5740 100644 (file)
@@ -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};
index dac95dfcfc04e4727237c789880ed316c1b7fbf8..b686a4b88e0884b3d8428d6dbc3f8e0fbe1e5c28 100644 (file)
@@ -37,7 +37,7 @@
 #include "BKE_customdata.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 /**
  * \brief Dissolve Vert
index e9c25fd4bbccb25edc0d97c3e1cd828c54da3d65..69e85fda002c9441b945d66fc1d9fb5847b4f977 100644 (file)
@@ -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:
index a696808c133d6136f36ff140c6257418b3bfbcfa..166a3bca37a7715417f2c68b85c43fc666692e77 100644 (file)
@@ -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);
index 09ca1024ce28a3780ce9e49176c060c712f1dd1e..a3c791a6af94f6fed472fbc29e82d45c35a41125 100644 (file)
@@ -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
index 7211d0808415f64ac6464395ed2d8ca6db4049fd..b80d6fe6e47530ab3959776ddbe95bbac3fd0b7a 100644 (file)
@@ -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)
 
index 5b4a06e372a38f80cf566065cfea80b5ea4449b5..fa6d9315fab59615980f96588c4ae35d81aa4d18 100644 (file)
@@ -32,7 +32,7 @@
  */
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 #include <stdlib.h>
 
index c08a544091357d2d003cb4273acede9a1236b6c5..30bbc9e9b2a235b7fb7b3f79e1360a0e6d6e86f6 100644 (file)
@@ -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"
 
 /**
index c54052e135e2b4ca87dbe246bff625ab87a5471e..3f17c7040b3141e0459a2d5e9b56f935ed1e2ac1 100644 (file)
@@ -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
index 8af80a184c017f38a9d0e1fbdd815eb70b207c6e..c35018729794353c98a7819b4d68222c703f6a9e 100644 (file)
@@ -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;
index ab5287a3d898b42fb0926af5f4476127e5a3307a..d62a22bcb8f945288e5024a0f192e931b1fdfd8d 100644 (file)
@@ -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,
index 3bb3f036990c55bed3b105d02f1d11942b408946..1d8b77e93009d085e3fd5687b140f97b4695bd12 100644 (file)
@@ -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
index ac8f7fc33ecb923323802c773a675e57c734063f..1f83a54e8f366851f6fe9ed4bd30a0708e042a4d 100644 (file)
  * ***** 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"
 #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)
 {
index c21e7a26f4d50cbff7f1e96bcc679ce53b794932..761222f87147bbe2cd2b5aad201a2f615e0ac29a 100644 (file)
@@ -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
 
index 54b0805df821a8580d5017f32c8e17d03c6705d8..b0eb7b514deb9f32e4c77a16305677cfeeadb4d7 100644 (file)
@@ -27,7 +27,7 @@
 #include "ED_mesh.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 
 
index e7987164f6ec33b882000337819c74d391007c35..8d657e7b677240fa38babde6aeb9203d778fb1dc 100644 (file)
@@ -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)
 {
index 95923e740420543606cbded9f68b34bb9e490abb..9a6d9e7b8369f46f4df8d5997b8e235e2c02be6d 100644 (file)
@@ -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 */
 
index 63837b7e0874bf9f2150177ce626209bed0e425f..42e43494a740087454f70244a9fc9fbc28555cfb 100644 (file)
@@ -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
index 9aed578dccc959e522151aa86f714da3c53bf1c3..198064d26dd604284d638702e212d2d9ae42453b 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "bmesh.h"
 
-#include "bmesh_operators_private.h" /* own include */
+#include "intern/bmesh_operators_private.h" /* own include */
 
 /*
  * UTILS.C
index 8e697304cabb756953939445ad582fe1a729273b..1bed489816636b6f4a74076f504fe230f6f80047 100644 (file)
@@ -42,7 +42,7 @@
 #include "BLI_memarena.h"
 
 #include "bmesh.h"
-#include "bmesh_private.h"
+#include "intern/bmesh_private.h"
 
 /* BMESH_TODO
  *
index f15de85754976b3c3c355eb868727266f986a536..7e4ca0212fbe5a13e0c13909b38927cbe4bc8c76 100644 (file)
@@ -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;
index 88c982609ea240d7f8e299ae10284b47d015305f..7a43c8cb770f67e2b8e18663361ff14ab1d0ecf7 100644 (file)
@@ -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);