Merging r48829 through r48861 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 12 Jul 2012 12:12:21 +0000 (12:12 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 12 Jul 2012 12:12:21 +0000 (12:12 +0000)
commit8764e7507fb7db71981c14f8bfec3e5bf14bbcdf
tree8c410fcdc6009046ab64f2afd292ea94ca6da391
parent36f6bf98d59f3954e56a12f4f7893ed44fb8c45c
parent8ef23c6743ce00176754597f60ae549093ab6339
Merging r48829 through r48861 from trunk into soc-2011-tomato
release/scripts/startup/bl_ui/space_clip.py
release/scripts/startup/bl_ui/space_info.py
source/blender/blenkernel/BKE_mask.h
source/blender/blenkernel/intern/colortools.c
source/blender/blenkernel/intern/mask.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_image/image_buttons.c
source/blender/makesrna/intern/rna_space.c