Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 9 Nov 2018 14:22:21 +0000 (15:22 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 9 Nov 2018 14:22:21 +0000 (15:22 +0100)
commit9c1c2a40bf73dce1b47d4e1bd865db1c5219fde6
treef30efdb693a9cdecd44091d4a48d1899e3baa55f
parent78a6689aea1976d42ba0fca927f3e7572768e1fb
parente6573138f73692bacc0474bd3c8d88a03afde1a6
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_session.h