Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 5 Jul 2018 05:54:47 +0000 (07:54 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 5 Jul 2018 05:54:47 +0000 (07:54 +0200)
commit49b86bcfec6885952458b3791cfc599463f02a35
tree902cce1e99b2f5182c3a87640d36a310748dc62b
parent53c63db2ee1bd544384840915c7f562819a7dbbc
parentcd17b3258327522b8c6f56a3ee7239a91f2be149
Merge branch 'master' into blender2.8
intern/cycles/device/device_cuda.cpp
intern/cycles/device/device_multi.cpp