svn merge ^/trunk/blender -r49933:49939
authorCampbell Barton <ideasman42@gmail.com>
Thu, 16 Aug 2012 14:48:43 +0000 (14:48 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 16 Aug 2012 14:48:43 +0000 (14:48 +0000)
1  2 
source/blender/compositor/operations/COM_InpaintOperation.cpp
source/blender/editors/space_image/image_ops.c