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)
commit15edae617fa4e77095953932b0e3120e91d5beb5
tree264b3f3473151d7ab4c5700bd6eb04c5aecdf4ab
parentf76c15efb70207cf4e92708e0565110bbae854ab
parentdabe5cd31add8aa55b9ad4bce1b591ed4e98f1a1
Merge branch 'blender2.7'
intern/cycles/device/device.cpp
intern/cycles/device/device.h
intern/cycles/render/session.cpp