diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-10-31 17:18:14 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-10-31 17:18:14 +0400 |
| commit | cd338a4130011ed9eccc7b131b11e4261b9dc269 (patch) | |
| tree | 767bb3edaa08fef0bb6ff039fced376f9a00e9c3 /source/blender/modifiers | |
| parent | 0a37e6ab976344818483df899b4fc44aedb30613 (diff) | |
| parent | a664e779ac8be0f926221d4c064394f9b3b6a801 (diff) | |
Merge with trunk r41411
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 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_solidify.c | 2 |
4 files changed, 16 insertions, 13 deletions
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 735437a0785..e8ecc75ca60 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -112,8 +112,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 77a2d577fb5..277ed2c3fb3 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 0e9b71c3e6d..1baa03d2063 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; diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index 8d47ad28a86..b8e95ad4c51 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -626,7 +626,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, add_v3_v3(edge_vert_nos[ed->v1], nor); add_v3_v3(edge_vert_nos[ed->v2], nor); #endif - origindex[numFaces * 2 + i]= ORIGINDEX_NONE; + origindex[numFaces * 2 + i]= fidx; } #ifdef SOLIDIFY_SIDE_NORMALS |