Merge branch 'master' into blender2.8
authorJulian Eisel <eiseljulian@gmail.com>
Sat, 13 May 2017 17:35:54 +0000 (19:35 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Sat, 13 May 2017 17:35:54 +0000 (19:35 +0200)
commit2d22092230d70586543970d47afc2f9a51a8304f
tree29e4ad9c6d77a48eca867b1f50d7787a4546e4a0
parent41c4c3f8fdd61910bbd61ce47d06f91f9cdac5b1
parent890d871bc32fed7bee352f88c34d8157fd234596
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_session.cpp