Merging r48889 through r48893 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 13 Jul 2012 14:21:17 +0000 (14:21 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 13 Jul 2012 14:21:17 +0000 (14:21 +0000)
commit4d92a00ca4641c54df1c19ede7bb31c7cbb11f04
treec95fab723b7153a915172312941aed40bcb3b2fc
parentef18a792c2c817c23e0fac896d3e8465cec75135
parent807ad1f0e0de49711d58ade2b660e74ec5452b2b
Merging r48889 through r48893 from trunk into soc-2011-tomato
source/blender/compositor/operations/COM_MaskOperation.cpp
source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
source/blender/editors/space_image/image_draw.c
source/blender/editors/space_node/node_draw.c