Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 2 May 2017 13:29:00 +0000 (15:29 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 2 May 2017 13:29:00 +0000 (15:29 +0200)
commit7f833c0da8848d424de9d2324412d8ca9d9c4e30
tree223a60022188132e5f7b64e9c649f80d72bfbcd7
parentec9ce9e11864146dc6748f2388b56f95346a5053
parent4384a7cf463eedea83179da80bbe12ff7d55578a
Merge branch 'master' into blender2.8
CMakeLists.txt
intern/cycles/device/device_cuda.cpp