Merge branch 'blender2.7'
authorJeroen Bakker <j.bakker@atmind.nl>
Fri, 15 Mar 2019 15:28:33 +0000 (16:28 +0100)
committerJeroen Bakker <j.bakker@atmind.nl>
Fri, 15 Mar 2019 15:28:33 +0000 (16:28 +0100)
commit5051e580e4028e0a741e6519e469321a7e1f2a71
tree83d1195eb21106155c0c949ae1453a9ce8665333
parent86ea76254d3f625bf3d9e15dade5d5b3544c06a3
parent2f6257fd7fe305e3b226a8b505eb614bbeaf762a
Merge branch 'blender2.7'
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_session.h
intern/cycles/device/device.h
intern/cycles/device/device_multi.cpp
intern/cycles/render/session.cpp