archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 43404.

Browse Source 
Conflicts resolved:
source/blender/python/SConscript
This commit is contained in:
Tamito Kajiyama
2012-01-15 23:13:12 +00:00
parent 76a211d809 23806a2b7d
commit e0df491d1e
413 changed files with 9731 additions and 5470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/SConscript
View File

@@ -7,7 +7,7 @@ Import ('env')
incs = '. ../editors/include ../makesdna ../makesrna ../blenfont ../blenlib ../blenkernel ../nodes'
incs += ' ../imbuf ../blenloader ../gpu ../render/extern/include ../windowmanager'
incs += ' ../freestyle/intern/python'
incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include'
incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include #intern/cycles/blender'
incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC']
is_debug = (env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG'])