Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 25 Oct 2017 08:13:35 +0000 (10:13 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 25 Oct 2017 08:13:35 +0000 (10:13 +0200)
1  2 
build_files/cmake/platform/platform_apple.cmake
intern/cycles/device/device_multi.cpp

Simple merge