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)
1  2 
intern/cycles/blender/blender_session.cpp