Merge with trunk up to r38584.

This commit is contained in:
Joerg Mueller
2011-07-21 21:11:58 +00:00
193 changed files with 18441 additions and 17999 deletions

View File

@@ -121,6 +121,7 @@ endif()
bf_intern_guardedalloc
bf_intern_memutil
bf_python_ext
bf_python_mathutils
bf_blenlib
bf_imbuf_cineon
bf_imbuf_openexr

View File

@@ -29,12 +29,12 @@ remove_strict_flags()
set(INC
.
..
..
../../blender/blenkernel
../../blender/blenloader
../../blender/makesdna
../../blender/makesrna
../../../intern/guardedalloc
../../../source/blender/makesdna
../../../source/blender/blenloader
../../../source/blender/makesrna
../../../source/blender/blenkernel
)
set(INC_SYS