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)
commit60799d6fee256427bcac7c0ca30d5197b4eddbc1
tree62a9c42a0b5b376097c64788228d7b27b97d2cce
parent513bc5954c714edfbc4a48dff118ac6b83f9a7bb
parent49e3f08815af17704e94c0e9eba0c6228a43972a
Merge branch 'blender2.7'
intern/cycles/blender/blender_session.cpp
intern/cycles/render/session.cpp