Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 21 Feb 2019 17:04:02 +0000 (18:04 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 21 Feb 2019 17:04:02 +0000 (18:04 +0100)
1  2 
intern/cycles/blender/blender_object.cpp
intern/cycles/render/session.cpp

Simple merge