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)
1  2 
intern/cycles/render/session.cpp

Simple merge