svn merge -r41335:41371

2011-10-30 01:27:49 +00:00
parent e48d7f4c11 f837b46a2b
commit bd86ba2c88
26 changed files with 134 additions and 69 deletions
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -80,8 +80,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'