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)
commit9af5d8f6dab04aaa2dafee0f1ae02b91eaa520a8
tree3e8491f07af9f571404e9d08e574469a2b694c86
parenta843a13008fb2f0d024405f4575666831cbe5809
parent81dd80f1d3da6db3227abafe431ac0e92c4e7197
svn merge ^/trunk/blender -r49933:49939
source/blender/compositor/operations/COM_InpaintOperation.cpp
source/blender/editors/space_image/image_ops.c