Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 8 Oct 2018 21:46:00 +0000 (08:46 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 8 Oct 2018 21:46:00 +0000 (08:46 +1100)
1  2 
intern/cycles/device/device_cuda.cpp
tests/python/modules/render_report.py

Simple merge
Simple merge