svn merge -r41779:41847 ^/trunk/blender

source/blender/blenkernel/SConscript

@@ -83,6 +83,9 @@ if env['OURPLATFORM'] == 'darwin':
 if env['WITH_BF_FLUID']:
     defs.append('WITH_MOD_FLUID')
 
+if env['WITH_BF_OCEANSIM']:
+    defs.append('WITH_OCEANSIM')
+
 if env['WITH_BF_LZO']:
     incs += ' #/extern/lzo/minilzo'
     defs.append('WITH_LZO')
@@ -101,6 +104,10 @@ if env['WITH_BF_LIBMV']:
     incs += ' #/extern/libmv'
     defs.append('WITH_LIBMV')
 
+if env['WITH_BF_FFTW3']:
+    defs.append('FFTW3=1')
+    incs += ' ' + env['BF_FFTW3_INC'] 
+
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']