Merging r47874 through r47885 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 14 Jun 2012 11:22:24 +0000 (11:22 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 14 Jun 2012 11:22:24 +0000 (11:22 +0000)
commit51035ec232bb21bb0b86481350a0cc6ab835a08f
treea650639a2e8e2830ea481b3efcaaced2f547d94d
parentf62ffbc53bab4348ce9639b0a6dd90500e2b7193
parenta57c8a37a10168fc4335c167c71939474be81e8c
Merging r47874 through r47885 from trunk into soc-2011-tomato
source/blender/compositor/intern/COM_Converter.cpp