griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

svn merge ^/trunk/blender -r42778:42839

Browse Source
This commit is contained in:
Campbell Barton
2011-12-23 08:41:53 +00:00
parent 87a3477200 ac498a6b64
commit 4ced91da47
116 changed files with 2071 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/SConscript
View File

@@ -5,7 +5,7 @@ sources = env.Glob('intern/*.c')
incs = '. #/intern/guardedalloc ../blenlib ../blenkernel'
incs += ' ../makesdna ../editors/include'
incs += ' ../render/extern/include ../makesrna ../nodes ../bmesh'
incs += ' ../render/extern/include ../makesrna ../nodes ../bmesh ../imbuf'
incs += ' ' + env['BF_ZLIB_INC']