diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-30 05:27:49 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-30 05:27:49 +0400 |
commit | bd86ba2c88aa912eefb38dc4a809f1ca1e49a31f (patch) | |
tree | b2464a5cc64089772d52c5e9e740a73210d60e6d /source/blender/modifiers | |
parent | e48d7f4c111ea61eec467e972be1005f953768b1 (diff) | |
parent | f837b46a2b561293660a0edf9d4de5ff16922f42 (diff) |
svn merge -r41335:41371
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/modifiers/SConscript | 12 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_fluidsim_util.c | 11 |
3 files changed, 15 insertions, 12 deletions
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index f31565dd48e..f383a9e86ea 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -113,8 +113,8 @@ if(WITH_MOD_DECIMATE) ) endif() -if(NOT WITH_MOD_FLUID) - add_definitions(-DDISABLE_ELBEEM) +if(WITH_MOD_FLUID) + add_definitions(-DWITH_MOD_FLUID) endif() if(WITH_GAMEENGINE) diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index c1f2ca63f6b..c330733e942 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -13,12 +13,14 @@ incs += ' ' + env['BF_ZLIB_INC'] defs = [] -# could be made optional -defs += ['WITH_MOD_BOOLEAN'] -defs += ['WITH_MOD_DECIMATE'] +if env ['WITH_BF_BOOLEAN']: + defs.append('WITH_MOD_BOOLEAN') -if env['BF_NO_ELBEEM']: - defs.append('DISABLE_ELBEEM') +if env ['WITH_BF_DECIMATE']: + defs.append('WITH_MOD_DECIMATE') + +if env['WITH_BF_FLUID']: + defs.append('WITH_MOD_FLUID') if env['WITH_BF_GAMEENGINE']: incs += ' #/extern/recastnavigation' diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index 5d8471e75dc..075a13985cb 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -62,9 +62,10 @@ // headers for fluidsim bobj meshes #include "LBM_fluidsim.h" + void fluidsim_init(FluidsimModifierData *fluidmd) { -#ifndef DISABLE_ELBEEM +#ifdef WITH_MOD_FLUID if(fluidmd) { FluidsimSettings *fss = MEM_callocN(sizeof(FluidsimSettings), "fluidsimsettings"); @@ -152,7 +153,7 @@ void fluidsim_init(FluidsimModifierData *fluidmd) void fluidsim_free(FluidsimModifierData *fluidmd) { -#ifndef DISABLE_ELBEEM +#ifdef WITH_MOD_FLUID if(fluidmd) { if(fluidmd->fss->meshVelocities) @@ -169,7 +170,7 @@ void fluidsim_free(FluidsimModifierData *fluidmd) return; } -#ifndef DISABLE_ELBEEM +#ifdef WITH_MOD_FLUID /* read .bobj.gz file into a fluidsimDerivedMesh struct */ static DerivedMesh *fluidsim_read_obj(const char *filename) { @@ -534,14 +535,14 @@ static DerivedMesh *fluidsim_read_cache(DerivedMesh *orgdm, FluidsimModifierData return dm; } -#endif // DISABLE_ELBEEM +#endif // WITH_MOD_FLUID DerivedMesh *fluidsimModifier_do(FluidsimModifierData *fluidmd, Scene *scene, Object *UNUSED(ob), DerivedMesh *dm, int useRenderParams, int UNUSED(isFinalCalc)) { -#ifndef DISABLE_ELBEEM +#ifdef WITH_MOD_FLUID DerivedMesh *result = NULL; int framenr; FluidsimSettings *fss = NULL; |