Merge with 2.5 -r 21619:21756.

2009-07-21 12:13:56 +00:00
parent 122104b3bb 0865bf2959
commit 122d392fef
259 changed files with 32203 additions and 25308 deletions
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -10,8 +10,8 @@ incs += ' ' + env['BF_PYTHON_INC']

 defs = []

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

 env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [140])