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)
1  2 
intern/cycles/device/device_cuda.cpp
intern/cycles/device/device_multi.cpp

Simple merge
Simple merge