svn merge ^/trunk/blender -r49067:49082
authorCampbell Barton <ideasman42@gmail.com>
Fri, 20 Jul 2012 14:02:51 +0000 (14:02 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 20 Jul 2012 14:02:51 +0000 (14:02 +0000)
commit10f14fb18155b312c65cbaafebbe02ec1ec19563
treeca6f6f1a9eccbd7db8ad5ac407d987d6dd7e0f76
parent8568ce6fc8b907ad9fa664703f808064c7b0c264
parent80a24a2ff55935296ccd2699091411bdb987dfb1
svn merge ^/trunk/blender -r49067:49082
source/blender/compositor/operations/COM_MaskOperation.cpp
source/blender/editors/space_image/image_buttons.c