Merging r49226 through r49238 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 26 Jul 2012 09:51:28 +0000 (09:51 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 26 Jul 2012 09:51:28 +0000 (09:51 +0000)
commit075e1180a393e4a6f3fdf8b211890ac7679fbfdc
tree5fd76cbbcc4fc713196644a3489d56bd9efdfa09
parent67d364304ca41e690e3893a8b8503d8c6af89dcd
parentc8ce3b76fff32342d267d9da1e3ac4186b98bdb2
Merging r49226 through r49238 from trunk into soc-2011-tomato
source/blender/blenkernel/BKE_mask.h
source/blender/blenkernel/intern/colortools.c
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/scene.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_image/image_ops.c
source/blender/imbuf/intern/filter.c