svn merge ^/trunk/blender -r48868:48888
authorCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2012 12:06:31 +0000 (12:06 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2012 12:06:31 +0000 (12:06 +0000)
commitef18a792c2c817c23e0fac896d3e8465cec75135
tree531eed1a54fa4ea69abe0d03b78dafb10b81dd60
parentbb09f856df821c33436b763a9fda9996e9ab7e5c
parentbccd5380f56c0cac18a5734e386efeee7b7e6d0f
svn merge ^/trunk/blender -r48868:48888
source/blender/blenkernel/BKE_mask.h
source/blender/blenkernel/intern/mask.c
source/blender/compositor/operations/COM_MaskOperation.cpp
source/creator/CMakeLists.txt