Merging r48954 through r48961 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Jul 2012 11:06:26 +0000 (11:06 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Jul 2012 11:06:26 +0000 (11:06 +0000)
1  2 
source/blender/blenkernel/BKE_mask.h
source/blender/compositor/operations/COM_MaskOperation.cpp

Simple merge