Merged changes in the trunk up to revision 52191.

Conflicts resolved: source/blender/makesdna/DNA_scene_types.h
2012-11-14 02:01:02 +00:00
parent 872af48183 de5d0d649d
commit 6cee7bb2b7
115 changed files with 1964 additions and 646 deletions
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -4,6 +4,7 @@ import os

 sources = env.Glob('intern/*.c')
 sources.remove('intern' + os.sep + 'mask_rasterize.c')
+sources.remove('intern' + os.sep + 'mask_evaluate.c')
 sources.remove('intern' + os.sep + 'mask.c')

 sources_mask = env.Glob('intern/mask*.c')