Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 24 Jan 2019 18:02:10 +0000 (19:02 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 24 Jan 2019 18:02:10 +0000 (19:02 +0100)
commit63bacfed4bf87879290c3633c75b327b2a46f7f7
tree3989aa2ba1c8f1aed35cef81c2d65ba8e66824b5
parent7a353a703770ea1c63f24733fbb2e37eafcbf98c
parent6260b3c15e5afd0a38c97a16d47665833f69a79f
Merge branch 'blender2.7'
intern/cycles/render/session.cpp