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)
commitd6b5ee99fed2d579f0b561e98cf5eaca4304fea6
tree98eeee99566a3727a7db3effccd855a835d18952
parent1de1cedf4c2fe3dc460267ea3134f17df508b7d9
parentf1304c973f5eef5169e09d30c0dba82cc7e4c4a1
Merge branch 'blender2.7'
intern/cycles/blender/blender_object.cpp
intern/cycles/render/session.cpp