[Bf-blender-cvs] [6bf57eb8bd9] cycles_embree: Merge branch 'master' of git.blender.org:blender into cycles_embree

[Stefan Werner]

Commit: 6bf57eb8bd9d32ef8ae0c5bf8d50cdbac5da2932
Author: Stefan Werner
Date:   Thu Apr 12 08:48:48 2018 +0200
Branches: cycles_embree
https://developer.blender.org/rB6bf57eb8bd9d32ef8ae0c5bf8d50cdbac5da2932

Merge branch 'master' of git.blender.org:blender into cycles_embree

===================================================================



===================================================================