svn merge -r 30954:31059 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2010-08-05 08:23:26 +00:00
parent 239477dcf7 a0cece42c6
commit 06d2dc86a1
353 changed files with 10607 additions and 12203 deletions
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -10,6 +10,9 @@ incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC']

 defs = []

+if env['BF_BUILDINFO']:
+	defs.append('BUILD_DATE')
+
 if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']:
 	defs.append('_DEBUG')