Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 27 Feb 2018 23:08:16 +0000 (00:08 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 27 Feb 2018 23:08:16 +0000 (00:08 +0100)
1  2 
intern/cycles/blender/blender_mesh.cpp
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_session.h