Merging r49300 through r49333 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 28 Jul 2012 18:42:54 +0000 (18:42 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 28 Jul 2012 18:42:54 +0000 (18:42 +0000)
commite6d80e584832c8f9353bb9baaf79e44cbfc3ab1a
tree9d34a7b7d68b5ecc0bbb4dbec739e37930cd7605
parent87a1d2935aa9fd8dbb4c2e354c6925c1ddf87744
parent7ecc0ba99930fb0ab7a63134f03c9ba5b24c1910
Merging r49300 through r49333 from trunk into soc-2011-tomato
build_files/scons/tools/Blender.py
build_files/scons/tools/btools.py
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/movieclip.c
source/blender/editors/include/ED_clip.h
source/blender/editors/space_clip/clip_editor.c
source/blender/makesdna/DNA_mask_types.h