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)
1  2 
source/blender/compositor/operations/COM_MaskOperation.cpp
source/blender/editors/space_image/image_buttons.c