Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 19 Sep 2018 16:42:17 +0000 (18:42 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 19 Sep 2018 16:42:17 +0000 (18:42 +0200)
commita53c81c60b69754408d9ada74677d24baa3aa1bb
tree5f9350090c2d589560d31829bdcef564b9cb45c3
parent6b433f4eb3da0acf092fb4e5417b10f9b304d073
parenta5101e4da8d81161482106d8d8d46ae49be6e18c
Merge branch 'master' into blender2.8
intern/cycles/device/device_cuda.cpp