svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-06 03:16:12 +00:00
parent 7495757553 fa32395b33
commit e74e245030
239 changed files with 11067 additions and 6854 deletions
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -71,7 +71,7 @@ if env['WITH_BF_GAMEENGINE']:
    defs.append('WITH_GAMEENGINE')
    
 if env['WITH_BF_FFTW3']:
-    defs.append('FFTW3=1')
+    defs.append('WITH_FFTW3')

 if env['WITH_BF_SDL']:
    defs.append('WITH_SDL')