Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 9 Jan 2019 16:20:58 +0000 (17:20 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 9 Jan 2019 16:20:58 +0000 (17:20 +0100)
1  2 
intern/cycles/blender/blender_session.cpp
intern/cycles/render/session.cpp

Simple merge