Merging r49451 through r49462 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 1 Aug 2012 15:05:42 +0000 (15:05 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 1 Aug 2012 15:05:42 +0000 (15:05 +0000)
1  2 
intern/cycles/device/device_opencl.cpp
source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
source/blender/editors/space_image/image_ops.c