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)
1  2 
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

Simple merge
Simple merge
Simple merge