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)
commit11100faa5cfbeb735194c6d2d5ed951dc5ae063a
treec27c2047640aa4773ea7953ee8bed06d7bec4a30
parentbc71aa5a4c5e0ce961803d7d0b7649ad6d384006
parent2eb94be7503f0931d02a65243ae116d7879faa9c
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_mesh.cpp
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_session.h