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)
commitaf21053087b93c015435a62cbedade03772c52c7
treee45e772130da677e41a4ce923d4842bdd963ed15
parentb491577cb7e43b4c219559645fe5ae92490422df
parent94ea566b5a185bd99c57eeaad974253896e0041c
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_sync.cpp