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)
commit4907f7c7e822b850a19b18a4bbe4f71413698d02
tree2b22a15b015e5934cdef452a5d950c95cd0f21d8
parent9be5c49bbb8ae3f914e028a2bd151310e724f582
parent9a385d12e37644bd7e56224e781a30652ae1ed84
Merging r48954 through r48961 from trunk into soc-2011-tomato
source/blender/blenkernel/BKE_mask.h
source/blender/compositor/operations/COM_MaskOperation.cpp