Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 29 Nov 2018 01:55:58 +0000 (12:55 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 29 Nov 2018 01:55:58 +0000 (12:55 +1100)
commit9893fee4e6ce5949c8d3274b2746855b3095258f
tree973d8b46af8d83705ecc97c21f12bbb1799af2a3
parent535984a848865c07a39610b32a53432d1a078c59
parent140f2209b61d637411cfbc22c755703c6220278f
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_sync.cpp
intern/cycles/device/device.cpp
intern/cycles/device/device.h
intern/cycles/render/session.cpp