Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 30 Aug 2018 15:40:06 +0000 (17:40 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 30 Aug 2018 15:40:06 +0000 (17:40 +0200)
1  2 
intern/cycles/blender/blender_sync.cpp