Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 16 Jun 2018 13:28:57 +0000 (15:28 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 16 Jun 2018 13:28:57 +0000 (15:28 +0200)
commit5600296c9dd134073b31b0d2cde2dc47e5ad1d60
tree475a9c04c7336b4078485c2375111f49845819cd
parent9d876960e8914bfa11bc3be1e500832711c20350
parentb955747875426c68c43e1f8bc7e4f2792f5bb22f
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_session.cpp