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)
commit733e6c0b1d2433166b7326c3654c5ece7ce17b88
tree265b6f10e6eb1e826743a02f9b12703038304142
parent11877e5bec4c590e51565c7e6191b33957dddc1c
parent3bc885e5f46ba103ed25f7e1c3bd897157ef768e
Merge branch 'master' into blender2.8
intern/cycles/device/device_cuda.cpp
tests/python/modules/render_report.py