diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-02 20:17:05 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-02 20:17:05 +0400 |
| commit | 2f453773f6b4cd0a03f5e2d9876ee250b87871f0 (patch) | |
| tree | 08c4bb2c1c3ee3fe5131e46a4e39b9224ba5c251 /source/blender/blenkernel/SConscript | |
| parent | 02fae3440c8b4b89aa0f9412bc4e0db60a787c13 (diff) | |
| parent | e1594ebb3c52f573a8a6c90f3d30acfb3de6e8a5 (diff) | |
Cycles: svn merge -r41266:41467 ^/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/SConscript')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 512eec4021f..ebb09352a55 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -79,8 +79,8 @@ if env['OURPLATFORM'] == 'darwin': if env['WITH_BF_OPENMP']: defs.append('PARALLEL=1') -if env['BF_NO_ELBEEM']: - defs.append('DISABLE_ELBEEM') +if env['WITH_BF_FLUID']: + defs.append('WITH_MOD_FLUID') if env['WITH_BF_LZO']: incs += ' #/extern/lzo/minilzo' |