Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 30 Nov 2018 06:07:59 +0000 (17:07 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 30 Nov 2018 06:07:59 +0000 (17:07 +1100)
1  2 
intern/cycles/blender/blender_sync.cpp