Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 23 Jan 2018 00:45:39 +0000 (11:45 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 23 Jan 2018 00:45:39 +0000 (11:45 +1100)
commitfc1fd2704a7b1cc448b20ed5cb596784cb764224
tree2b24db79955d2ac49e0d45d269cec0917a387cdc
parent367e61117907bb7507935251ecb7e396a4c91cbc
parentbf7e4067663cec0a3b4d3194e89a28aa62b39773
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_mesh.cpp
intern/cycles/blender/blender_python.cpp
intern/cycles/blender/blender_sync.cpp
intern/cycles/device/device.cpp
intern/cycles/device/device.h
intern/cycles/device/device_cuda.cpp