diff options
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/modifiers/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/modifiers/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_skin.c | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index b841356709e..71c84fd1e8a 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -133,6 +133,10 @@ if(WITH_MOD_OCEANSIM) add_definitions(-DWITH_OCEANSIM) endif() +if(WITH_BULLET) + add_definitions(-DWITH_BULLET) +endif() + if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index 0942bca4ef3..c112f525398 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -64,6 +64,9 @@ if env['WITH_BF_FLUID']: if env['WITH_BF_OCEANSIM']: defs.append('WITH_OCEANSIM') +if env['WITH_BF_BULLET']: + defs.append('WITH_BULLET') + if env['WITH_BF_GAMEENGINE']: incs.append('#/extern/recastnavigation') defs.append('WITH_GAMEENGINE') diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index 825015fa25c..dd5688134ec 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -218,6 +218,7 @@ static bool skin_frame_find_contained_faces(const Frame *frame, /* Returns true if hull is successfully built, false otherwise */ static bool build_hull(SkinOutput *so, Frame **frames, int totframe) { +#ifdef WITH_BULLET BMesh *bm = so->bm; BMOperator op; BMIter iter; @@ -326,6 +327,9 @@ static bool build_hull(SkinOutput *so, Frame **frames, int totframe) BM_mesh_delete_hflag_tagged(bm, BM_ELEM_TAG, BM_EDGE | BM_FACE); return true; +#else + return false; +#endif } /* Returns the average frame side length (frames are rectangular, so |