Merging r49840 through r49854 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 12 Aug 2012 18:39:05 +0000 (18:39 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 12 Aug 2012 18:39:05 +0000 (18:39 +0000)
commitcacf56c97ba485fdd6eb93a4fe340ffb3869020d
tree2d470c4d879733116f013609a676a5a62089c060
parentbd71fb6d1dde254fd77e9c3e9201d182c629cf80
parent38541284c5eb48eea7530f01e0a111fc80c2c078
Merging r49840 through r49854 from trunk into soc-2011-tomato
source/blender/blenkernel/SConscript
source/blender/compositor/operations/COM_InpaintOperation.cpp