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)
commit645cc3e8710b043e214931ae4110c2d86034b946
tree366cb98a8dd9b6562ab9ff876f507008a0cacb20
parent8ba1c3072ca9fd3b2ab3be3bffa617c2a5cf0b7b
parente3b1ae9a8166ebb2e5255b5c1f93c383b87a7024
Merge branch 'blender2.7'
intern/cycles/render/session.cpp