Merged changes in the trunk up to revision 31403.

This commit is contained in:
2010-08-17 07:10:03 +00:00
462 changed files with 15264 additions and 10984 deletions

View File

@@ -7,7 +7,7 @@ incs = '. ../editors/include ../makesdna ../makesrna ../blenlib ../blenkernel ..
incs += ' ../imbuf ../blenloader ../render/extern/include ../windowmanager'
incs += ' ../freestyle/intern/python'
incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include'
incs += ' ' + env['BF_PYTHON_INC']
incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC']
defs = []