Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 12 Mar 2019 13:22:53 +0000 (14:22 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 12 Mar 2019 13:22:53 +0000 (14:22 +0100)
1  2 
intern/cycles/render/session.cpp

Simple merge