Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 7 Nov 2017 12:57:16 +0000 (13:57 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 7 Nov 2017 12:57:16 +0000 (13:57 +0100)
1  2 
intern/cycles/blender/blender_sync.cpp