Merged revision(s) 57587-57670 from trunk/blender into soc-2013-dingto
authorThomas Dinges <blender@dingto.org>
Sun, 23 Jun 2013 18:04:13 +0000 (18:04 +0000)
committerThomas Dinges <blender@dingto.org>
Sun, 23 Jun 2013 18:04:13 +0000 (18:04 +0000)
commit00234dab2f1a697a33659beee4f4c8856b5ce233
treeb79dff3daa9d475f0981962b2ede5c4954457b72
parente4ef608020e3d77f05ec869e598dfa42d525da66
parent9b6f05e3ad3c695d523c7cfec918e0f89828dec1
Merged revision(s) 57587-57670 from trunk/blender into soc-2013-dingto
intern/cycles/device/device_cuda.cpp
intern/cycles/kernel/CMakeLists.txt
intern/cycles/kernel/kernel_types.h
intern/cycles/render/nodes.cpp