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)
commit3979aad82fcd1e4a2a9352f2eb8a422fc35a511c
tree8b7eaaaea0fa4c04465ec757a9db9d2fc999dfba
parentde4e940885f20b17a2e527599626105d50cae71d
parent45801286a5c740ac03af7c9c7f59b59663ef9066
Merging r49451 through r49462 from trunk into soc-2011-tomato
intern/cycles/device/device_opencl.cpp
source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
source/blender/editors/space_image/image_ops.c