Merge branch 'blender2.7'
authorJeroen Bakker <j.bakker@atmind.nl>
Tue, 26 Feb 2019 13:07:57 +0000 (14:07 +0100)
committerJeroen Bakker <j.bakker@atmind.nl>
Tue, 26 Feb 2019 13:07:57 +0000 (14:07 +0100)
1  2 
intern/cycles/device/device.cpp
intern/cycles/device/device.h
intern/cycles/render/session.cpp

Simple merge
Simple merge
Simple merge