Merged changes in the trunk up to revision 32565.

2010-10-18 20:40:43 +00:00
parent 90b69a13a7 bf09c851a9
commit 894daa01be
676 changed files with 7637 additions and 5445 deletions
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -25,7 +25,7 @@ else:
    incs += ' ../python'
    incs += ' ' + env['BF_PYTHON_INC']
    if env['BF_DEBUG']:
-        defs.append('_DEBUG')
+        defs.append('DEBUG')

 if env['WITH_BF_QUICKTIME']:
    incs += ' ../quicktime'